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 2021/02/01 13:47:14 UTC
[camel-spring-boot] 04/04: CAMEL-16111: Regen
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-spring-boot-3.7.x
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit b1ba26ca087f9218ba3320844ae3432db0a53bf7
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Feb 1 14:45:35 2021 +0100
CAMEL-16111: Regen
---
.../springboot/ApnsComponentAutoConfiguration.java | 5 +--
.../apns/springboot/ApnsComponentConverter.java | 22 +++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../ArangoDbComponentAutoConfiguration.java | 5 +--
.../springboot/ArangoDbComponentConverter.java | 22 +++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/AS2ComponentAutoConfiguration.java | 5 +--
.../as2/springboot/AS2ComponentConverter.java | 22 +++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../AsteriskComponentAutoConfiguration.java | 3 +-
.../AtlasMapComponentAutoConfiguration.java | 5 +--
.../springboot/AtlasMapComponentConverter.java | 22 +++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../AtmosComponentAutoConfiguration.java | 3 +-
.../WebsocketComponentAutoConfiguration.java | 5 +--
.../springboot/WebsocketComponentConverter.java | 29 ++++++-------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/AtomComponentAutoConfiguration.java | 3 +-
.../AtomixMapComponentAutoConfiguration.java | 5 +--
.../springboot/AtomixMapComponentConverter.java | 27 +++++++------
.../AtomixMessagingComponentAutoConfiguration.java | 5 +--
.../AtomixMessagingComponentConverter.java | 27 +++++++------
.../AtomixMultiMapComponentAutoConfiguration.java | 5 +--
.../AtomixMultiMapComponentConverter.java | 27 +++++++------
.../AtomixQueueComponentAutoConfiguration.java | 5 +--
.../springboot/AtomixQueueComponentConverter.java | 27 +++++++------
.../AtomixSetComponentAutoConfiguration.java | 5 +--
.../springboot/AtomixSetComponentConverter.java | 27 +++++++------
.../AtomixValueComponentAutoConfiguration.java | 5 +--
.../springboot/AtomixValueComponentConverter.java | 27 +++++++------
.../src/main/resources/META-INF/spring.factories | 14 ++++++-
.../springboot/AvroComponentAutoConfiguration.java | 5 +--
.../avro/springboot/AvroComponentConverter.java | 24 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/CwComponentAutoConfiguration.java | 5 +--
.../aws/cw/springboot/CwComponentConverter.java | 24 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/DdbComponentAutoConfiguration.java | 5 +--
.../aws/ddb/springboot/DdbComponentConverter.java | 24 ++++++-----
.../DdbStreamComponentAutoConfiguration.java | 5 +--
.../springboot/DdbStreamComponentConverter.java | 27 +++++++------
.../src/main/resources/META-INF/spring.factories | 6 ++-
.../springboot/EC2ComponentAutoConfiguration.java | 5 +--
.../aws/ec2/springboot/EC2ComponentConverter.java | 24 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/ECSComponentAutoConfiguration.java | 5 +--
.../aws/ecs/springboot/ECSComponentConverter.java | 24 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/EKSComponentAutoConfiguration.java | 5 +--
.../aws/eks/springboot/EKSComponentConverter.java | 24 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/IAMComponentAutoConfiguration.java | 5 +--
.../aws/iam/springboot/IAMComponentConverter.java | 24 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../KinesisFirehoseComponentAutoConfiguration.java | 5 +--
.../KinesisFirehoseComponentConverter.java | 25 ++++++------
.../KinesisComponentAutoConfiguration.java | 5 +--
.../springboot/KinesisComponentConverter.java | 24 ++++++-----
.../src/main/resources/META-INF/spring.factories | 6 ++-
.../springboot/KMSComponentAutoConfiguration.java | 5 +--
.../aws/kms/springboot/KMSComponentConverter.java | 24 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../LambdaComponentAutoConfiguration.java | 5 +--
.../springboot/LambdaComponentConverter.java | 24 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/MQComponentAutoConfiguration.java | 5 +--
.../aws/mq/springboot/MQComponentConverter.java | 24 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/MSKComponentAutoConfiguration.java | 5 +--
.../aws/msk/springboot/MSKComponentConverter.java | 24 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/S3ComponentAutoConfiguration.java | 5 +--
.../aws/s3/springboot/S3ComponentConverter.java | 28 +++++++------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/SdbComponentAutoConfiguration.java | 3 +-
.../springboot/SesComponentAutoConfiguration.java | 5 +--
.../aws/ses/springboot/SesComponentConverter.java | 24 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/SnsComponentAutoConfiguration.java | 5 +--
.../aws/sns/springboot/SnsComponentConverter.java | 26 ++++++------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/SqsComponentAutoConfiguration.java | 5 +--
.../aws/sqs/springboot/SqsComponentConverter.java | 24 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/SWFComponentAutoConfiguration.java | 5 +--
.../aws/swf/springboot/SWFComponentConverter.java | 34 ++++++++--------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../TranslateComponentAutoConfiguration.java | 5 +--
.../springboot/TranslateComponentConverter.java | 25 ++++++------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../Athena2ComponentAutoConfiguration.java | 5 +--
.../springboot/Athena2ComponentConverter.java | 24 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/Cw2ComponentAutoConfiguration.java | 5 +--
.../aws2/cw/springboot/Cw2ComponentConverter.java | 26 ++++++------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/Ddb2ComponentAutoConfiguration.java | 5 +--
.../ddb/springboot/Ddb2ComponentConverter.java | 24 ++++++-----
.../Ddb2StreamComponentAutoConfiguration.java | 5 +--
.../springboot/Ddb2StreamComponentConverter.java | 27 +++++++------
.../src/main/resources/META-INF/spring.factories | 6 ++-
.../AWS2EC2ComponentAutoConfiguration.java | 5 +--
.../ec2/springboot/AWS2EC2ComponentConverter.java | 24 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/ECS2ComponentAutoConfiguration.java | 5 +--
.../ecs/springboot/ECS2ComponentConverter.java | 24 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/EKS2ComponentAutoConfiguration.java | 5 +--
.../eks/springboot/EKS2ComponentConverter.java | 24 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../EventbridgeComponentAutoConfiguration.java | 5 +--
.../springboot/EventbridgeComponentConverter.java | 25 ++++++------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/IAM2ComponentAutoConfiguration.java | 5 +--
.../iam/springboot/IAM2ComponentConverter.java | 24 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
...KinesisFirehose2ComponentAutoConfiguration.java | 5 +--
.../KinesisFirehose2ComponentConverter.java | 25 ++++++------
.../Kinesis2ComponentAutoConfiguration.java | 5 +--
.../springboot/Kinesis2ComponentConverter.java | 24 ++++++-----
.../src/main/resources/META-INF/spring.factories | 6 ++-
.../springboot/KMS2ComponentAutoConfiguration.java | 5 +--
.../kms/springboot/KMS2ComponentConverter.java | 24 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../Lambda2ComponentAutoConfiguration.java | 5 +--
.../springboot/Lambda2ComponentConverter.java | 24 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/MQ2ComponentAutoConfiguration.java | 5 +--
.../aws2/mq/springboot/MQ2ComponentConverter.java | 24 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/MSK2ComponentAutoConfiguration.java | 5 +--
.../msk/springboot/MSK2ComponentConverter.java | 24 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../AWS2S3ComponentAutoConfiguration.java | 5 +--
.../s3/springboot/AWS2S3ComponentConverter.java | 26 ++++++------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/Ses2ComponentAutoConfiguration.java | 5 +--
.../ses/springboot/Ses2ComponentConverter.java | 24 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/Sns2ComponentAutoConfiguration.java | 5 +--
.../sns/springboot/Sns2ComponentConverter.java | 24 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/Sqs2ComponentAutoConfiguration.java | 5 +--
.../sqs/springboot/Sqs2ComponentConverter.java | 24 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/STS2ComponentAutoConfiguration.java | 5 +--
.../sts/springboot/STS2ComponentConverter.java | 24 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../Translate2ComponentAutoConfiguration.java | 5 +--
.../springboot/Translate2ComponentConverter.java | 25 ++++++------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../EventHubsComponentAutoConfiguration.java | 5 +--
.../springboot/EventHubsComponentConverter.java | 31 +++++++-------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../BlobServiceComponentAutoConfiguration.java | 5 +--
.../springboot/BlobServiceComponentConverter.java | 27 +++++++------
.../QueueServiceComponentAutoConfiguration.java | 5 +--
.../springboot/QueueServiceComponentConverter.java | 27 +++++++------
.../src/main/resources/META-INF/spring.factories | 6 ++-
.../springboot/BlobComponentAutoConfiguration.java | 5 +--
.../blob/springboot/BlobComponentConverter.java | 28 +++++++------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../QueueComponentAutoConfiguration.java | 5 +--
.../queue/springboot/QueueComponentConverter.java | 28 +++++++------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/BeanComponentAutoConfiguration.java | 3 +-
.../ClassComponentAutoConfiguration.java | 3 +-
.../BeanValidatorComponentAutoConfiguration.java | 5 +--
.../BeanValidatorComponentConverter.java | 31 +++++++-------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../BeanstalkComponentAutoConfiguration.java | 5 +--
.../springboot/BeanstalkComponentConverter.java | 23 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../BonitaComponentAutoConfiguration.java | 3 +-
.../springboot/BoxComponentAutoConfiguration.java | 5 +--
.../box/springboot/BoxComponentConverter.java | 26 ++++++------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../BraintreeComponentAutoConfiguration.java | 5 +--
.../springboot/BraintreeComponentConverter.java | 23 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../BrowseComponentAutoConfiguration.java | 3 +-
.../CaffeineCacheComponentAutoConfiguration.java | 5 +--
.../CaffeineCacheComponentConverter.java | 29 ++++++-------
...affeineLoadCacheComponentAutoConfiguration.java | 5 +--
.../CaffeineLoadCacheComponentConverter.java | 29 ++++++-------
.../src/main/resources/META-INF/spring.factories | 6 ++-
.../CassandraComponentAutoConfiguration.java | 3 +-
.../ChatScriptComponentAutoConfiguration.java | 3 +-
.../ChunkComponentAutoConfiguration.java | 3 +-
.../springboot/CMComponentAutoConfiguration.java | 3 +-
.../springboot/CMISComponentAutoConfiguration.java | 5 +--
.../cmis/springboot/CMISComponentConverter.java | 22 +++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/CoAPComponentAutoConfiguration.java | 3 +-
.../CometdComponentAutoConfiguration.java | 5 +--
.../springboot/CometdComponentConverter.java | 24 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../ConsulComponentAutoConfiguration.java | 5 +--
.../springboot/ConsulComponentConverter.java | 30 +++++++-------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../ControlBusComponentAutoConfiguration.java | 3 +-
.../CordaComponentAutoConfiguration.java | 5 +--
.../corda/springboot/CordaComponentConverter.java | 26 ++++++------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../CouchbaseComponentAutoConfiguration.java | 3 +-
.../CouchDbComponentAutoConfiguration.java | 3 +-
.../springboot/CronComponentAutoConfiguration.java | 3 +-
.../CryptoCmsComponentAutoConfiguration.java | 5 +--
.../springboot/CryptoCmsComponentConverter.java | 25 ++++++------
.../src/main/resources/META-INF/spring.factories | 4 +-
...DigitalSignatureComponentAutoConfiguration.java | 5 +--
.../DigitalSignatureComponentConverter.java | 35 ++++++++--------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../CxfRsComponentAutoConfiguration.java | 5 +--
.../jaxrs/springboot/CxfRsComponentConverter.java | 22 +++++-----
.../springboot/CxfComponentAutoConfiguration.java | 5 +--
.../cxf/springboot/CxfComponentConverter.java | 22 +++++-----
.../src/main/resources/META-INF/spring.factories | 6 ++-
.../DataFormatComponentAutoConfiguration.java | 3 +-
.../DataSetComponentAutoConfiguration.java | 3 +-
.../DataSetTestComponentAutoConfiguration.java | 3 +-
.../DebeziumMongodbComponentAutoConfiguration.java | 5 +--
.../DebeziumMongodbComponentConverter.java | 23 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../DebeziumMySqlComponentAutoConfiguration.java | 5 +--
.../DebeziumMySqlComponentConverter.java | 23 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
...DebeziumPostgresComponentAutoConfiguration.java | 5 +--
.../DebeziumPostgresComponentConverter.java | 23 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
...ebeziumSqlserverComponentAutoConfiguration.java | 5 +--
.../DebeziumSqlserverComponentConverter.java | 23 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../DigitalOceanComponentAutoConfiguration.java | 3 +-
.../DirectComponentAutoConfiguration.java | 3 +-
.../DirectVmComponentAutoConfiguration.java | 5 +--
.../springboot/DirectVmComponentConverter.java | 22 +++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../DisruptorComponentAutoConfiguration.java | 3 +-
.../DisruptorVmComponentAutoConfiguration.java | 3 +-
.../springboot/DJLComponentAutoConfiguration.java | 3 +-
.../springboot/DnsComponentAutoConfiguration.java | 3 +-
.../DockerComponentAutoConfiguration.java | 5 +--
.../springboot/DockerComponentConverter.java | 22 +++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../DozerComponentAutoConfiguration.java | 3 +-
.../DrillComponentAutoConfiguration.java | 3 +-
.../DropboxComponentAutoConfiguration.java | 3 +-
.../EhcacheComponentAutoConfiguration.java | 5 +--
.../springboot/EhcacheComponentConverter.java | 26 ++++++------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../ElasticsearchComponentAutoConfiguration.java | 5 +--
.../ElasticsearchComponentConverter.java | 23 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../ElsqlComponentAutoConfiguration.java | 5 +--
.../elsql/springboot/ElsqlComponentConverter.java | 24 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../EtcdKeysComponentAutoConfiguration.java | 5 +--
.../springboot/EtcdKeysComponentConverter.java | 24 ++++++-----
.../EtcdStatsComponentAutoConfiguration.java | 5 +--
.../springboot/EtcdStatsComponentConverter.java | 25 ++++++------
.../EtcdWatchComponentAutoConfiguration.java | 5 +--
.../springboot/EtcdWatchComponentConverter.java | 25 ++++++------
.../src/main/resources/META-INF/spring.factories | 8 +++-
.../springboot/ExecComponentAutoConfiguration.java | 3 +-
.../FacebookComponentAutoConfiguration.java | 5 +--
.../springboot/FacebookComponentConverter.java | 22 +++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/FhirComponentAutoConfiguration.java | 5 +--
.../fhir/springboot/FhirComponentConverter.java | 28 +++++++------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/FileComponentAutoConfiguration.java | 3 +-
.../FileWatchComponentAutoConfiguration.java | 5 +--
.../springboot/FileWatchComponentConverter.java | 23 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../FlatpackComponentAutoConfiguration.java | 3 +-
.../FlinkComponentAutoConfiguration.java | 5 +--
.../flink/springboot/FlinkComponentConverter.java | 26 ++++++------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/FopComponentAutoConfiguration.java | 3 +-
.../FreemarkerComponentAutoConfiguration.java | 5 +--
.../springboot/FreemarkerComponentConverter.java | 23 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/FtpComponentAutoConfiguration.java | 3 +-
.../springboot/FtpsComponentAutoConfiguration.java | 3 +-
.../springboot/SftpComponentAutoConfiguration.java | 3 +-
.../GangliaComponentAutoConfiguration.java | 5 +--
.../springboot/GangliaComponentConverter.java | 22 +++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../GeoCoderComponentAutoConfiguration.java | 5 +--
.../springboot/GeoCoderComponentConverter.java | 22 +++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/GitComponentAutoConfiguration.java | 3 +-
.../GitHubComponentAutoConfiguration.java | 3 +-
.../GoogleBigQueryComponentAutoConfiguration.java | 5 +--
.../GoogleBigQueryComponentConverter.java | 23 ++++++-----
...oogleBigQuerySQLComponentAutoConfiguration.java | 5 +--
.../GoogleBigQuerySQLComponentConverter.java | 23 ++++++-----
.../src/main/resources/META-INF/spring.factories | 6 ++-
.../GoogleCalendarComponentAutoConfiguration.java | 5 +--
.../GoogleCalendarComponentConverter.java | 25 ++++++------
...leCalendarStreamComponentAutoConfiguration.java | 5 +--
.../GoogleCalendarStreamComponentConverter.java | 23 ++++++-----
.../src/main/resources/META-INF/spring.factories | 6 ++-
.../GoogleDriveComponentAutoConfiguration.java | 5 +--
.../springboot/GoogleDriveComponentConverter.java | 25 ++++++------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../GoogleMailComponentAutoConfiguration.java | 5 +--
.../springboot/GoogleMailComponentConverter.java | 25 ++++++------
...GoogleMailStreamComponentAutoConfiguration.java | 5 +--
.../GoogleMailStreamComponentConverter.java | 25 ++++++------
.../src/main/resources/META-INF/spring.factories | 6 ++-
.../GooglePubsubComponentAutoConfiguration.java | 3 +-
.../GoogleSheetsComponentAutoConfiguration.java | 5 +--
.../springboot/GoogleSheetsComponentConverter.java | 25 ++++++------
...ogleSheetsStreamComponentAutoConfiguration.java | 5 +--
.../GoogleSheetsStreamComponentConverter.java | 25 ++++++------
.../src/main/resources/META-INF/spring.factories | 6 ++-
.../springboot/GoraComponentAutoConfiguration.java | 3 +-
.../GrapeComponentAutoConfiguration.java | 5 +--
.../grape/springboot/GrapeComponentConverter.java | 22 +++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../GraphqlComponentAutoConfiguration.java | 3 +-
.../springboot/GrpcComponentAutoConfiguration.java | 3 +-
.../GuavaEventBusComponentAutoConfiguration.java | 5 +--
.../GuavaEventBusComponentConverter.java | 23 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
...castAtomicnumberComponentAutoConfiguration.java | 5 +--
.../HazelcastAtomicnumberComponentConverter.java | 21 +++++-----
...azelcastInstanceComponentAutoConfiguration.java | 5 +--
.../HazelcastInstanceComponentConverter.java | 23 ++++++-----
.../HazelcastListComponentAutoConfiguration.java | 5 +--
.../HazelcastListComponentConverter.java | 23 ++++++-----
.../HazelcastMapComponentAutoConfiguration.java | 5 +--
.../springboot/HazelcastMapComponentConverter.java | 23 ++++++-----
...azelcastMultimapComponentAutoConfiguration.java | 5 +--
.../HazelcastMultimapComponentConverter.java | 23 ++++++-----
.../HazelcastQueueComponentAutoConfiguration.java | 5 +--
.../HazelcastQueueComponentConverter.java | 23 ++++++-----
...astReplicatedmapComponentAutoConfiguration.java | 5 +--
.../HazelcastReplicatedmapComponentConverter.java | 21 +++++-----
...elcastRingbufferComponentAutoConfiguration.java | 5 +--
.../HazelcastRingbufferComponentConverter.java | 21 +++++-----
.../HazelcastSedaComponentAutoConfiguration.java | 5 +--
.../HazelcastSedaComponentConverter.java | 23 ++++++-----
.../HazelcastSetComponentAutoConfiguration.java | 5 +--
.../springboot/HazelcastSetComponentConverter.java | 23 ++++++-----
.../HazelcastTopicComponentAutoConfiguration.java | 5 +--
.../HazelcastTopicComponentConverter.java | 23 ++++++-----
.../src/main/resources/META-INF/spring.factories | 24 ++++++++++-
.../HBaseComponentAutoConfiguration.java | 5 +--
.../hbase/springboot/HBaseComponentConverter.java | 22 +++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/HdfsComponentAutoConfiguration.java | 5 +--
.../hdfs/springboot/HdfsComponentConverter.java | 22 +++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/HttpComponentAutoConfiguration.java | 5 +--
.../http/springboot/HttpComponentConverter.java | 38 ++++++++---------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../ClientComponentAutoConfiguration.java | 5 +--
.../springboot/ClientComponentConverter.java | 22 +++++-----
.../ServerComponentAutoConfiguration.java | 5 +--
.../springboot/ServerComponentConverter.java | 22 +++++-----
.../src/main/resources/META-INF/spring.factories | 6 ++-
.../IgniteCacheComponentAutoConfiguration.java | 5 +--
.../springboot/IgniteCacheComponentConverter.java | 25 ++++++------
.../IgniteComputeComponentAutoConfiguration.java | 5 +--
.../IgniteComputeComponentConverter.java | 25 ++++++------
.../IgniteEventsComponentAutoConfiguration.java | 5 +--
.../springboot/IgniteEventsComponentConverter.java | 25 ++++++------
.../IgniteIdGenComponentAutoConfiguration.java | 5 +--
.../springboot/IgniteIdGenComponentConverter.java | 25 ++++++------
.../IgniteMessagingComponentAutoConfiguration.java | 5 +--
.../IgniteMessagingComponentConverter.java | 25 ++++++------
.../IgniteQueueComponentAutoConfiguration.java | 5 +--
.../springboot/IgniteQueueComponentConverter.java | 25 ++++++------
.../IgniteSetComponentAutoConfiguration.java | 5 +--
.../springboot/IgniteSetComponentConverter.java | 25 ++++++------
.../src/main/resources/META-INF/spring.factories | 16 +++++++-
.../InfinispanComponentAutoConfiguration.java | 5 +--
.../springboot/InfinispanComponentConverter.java | 31 +++++++-------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../InfluxDbComponentAutoConfiguration.java | 5 +--
.../springboot/InfluxDbComponentConverter.java | 22 +++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/IOTAComponentAutoConfiguration.java | 3 +-
.../springboot/IPFSComponentAutoConfiguration.java | 3 +-
.../springboot/IrcComponentAutoConfiguration.java | 3 +-
.../IronMQComponentAutoConfiguration.java | 3 +-
.../springboot/JBPMComponentAutoConfiguration.java | 3 +-
.../JCacheComponentAutoConfiguration.java | 5 +--
.../springboot/JCacheComponentConverter.java | 22 +++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../JcloudsComponentAutoConfiguration.java | 3 +-
.../springboot/JcrComponentAutoConfiguration.java | 3 +-
.../springboot/JdbcComponentAutoConfiguration.java | 5 +--
.../jdbc/springboot/JdbcComponentConverter.java | 22 +++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../JettyHttpComponentAutoConfiguration9.java | 5 +--
.../springboot/JettyHttpComponentConverter9.java | 37 ++++++++---------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../JGroupsRaftComponentAutoConfiguration.java | 5 +--
.../springboot/JGroupsRaftComponentConverter.java | 25 ++++++------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../JGroupsComponentAutoConfiguration.java | 5 +--
.../springboot/JGroupsComponentConverter.java | 22 +++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/JingComponentAutoConfiguration.java | 3 +-
.../springboot/JiraComponentAutoConfiguration.java | 5 +--
.../jira/springboot/JiraComponentConverter.java | 22 +++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/JmsComponentAutoConfiguration.java | 5 +--
.../jms/springboot/JmsComponentConverter.java | 44 ++++++++++----------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/JMXComponentAutoConfiguration.java | 3 +-
.../springboot/JoltComponentAutoConfiguration.java | 5 +--
.../jolt/springboot/JoltComponentConverter.java | 22 +++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/JooqComponentAutoConfiguration.java | 5 +--
.../jooq/springboot/JooqComponentConverter.java | 24 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/JpaComponentAutoConfiguration.java | 5 +--
.../jpa/springboot/JpaComponentConverter.java | 24 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/ScpComponentAutoConfiguration.java | 3 +-
.../springboot/JsltComponentAutoConfiguration.java | 5 +--
.../jslt/springboot/JsltComponentConverter.java | 22 +++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../JsonValidatorComponentAutoConfiguration.java | 3 +-
.../JsonataComponentAutoConfiguration.java | 3 +-
.../Jt400ComponentAutoConfiguration.java | 5 +--
.../jt400/springboot/Jt400ComponentConverter.java | 22 +++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../KafkaComponentAutoConfiguration.java | 5 +--
.../kafka/springboot/KafkaComponentConverter.java | 36 +++++++++--------
.../src/main/resources/META-INF/spring.factories | 4 +-
...rnetesConfigMapsComponentAutoConfiguration.java | 3 +-
...sCustomResourcesComponentAutoConfiguration.java | 3 +-
...netesDeploymentsComponentAutoConfiguration.java | 3 +-
.../KubernetesHPAComponentAutoConfiguration.java | 3 +-
.../KubernetesJobComponentAutoConfiguration.java | 3 +-
...rnetesNamespacesComponentAutoConfiguration.java | 3 +-
.../KubernetesNodesComponentAutoConfiguration.java | 3 +-
...ersistentVolumesComponentAutoConfiguration.java | 3 +-
...entVolumesClaimsComponentAutoConfiguration.java | 3 +-
.../KubernetesPodsComponentAutoConfiguration.java | 3 +-
...ationControllersComponentAutoConfiguration.java | 3 +-
...esResourcesQuotaComponentAutoConfiguration.java | 3 +-
...ubernetesSecretsComponentAutoConfiguration.java | 3 +-
...sServiceAccountsComponentAutoConfiguration.java | 3 +-
...bernetesServicesComponentAutoConfiguration.java | 3 +-
...hiftBuildConfigsComponentAutoConfiguration.java | 3 +-
.../OpenshiftBuildsComponentAutoConfiguration.java | 3 +-
.../springboot/KuduComponentAutoConfiguration.java | 3 +-
.../LanguageComponentAutoConfiguration.java | 3 +-
.../springboot/LdapComponentAutoConfiguration.java | 3 +-
.../springboot/LdifComponentAutoConfiguration.java | 3 +-
.../springboot/LogComponentAutoConfiguration.java | 5 +--
.../log/springboot/LogComponentConverter.java | 22 +++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../LuceneComponentAutoConfiguration.java | 5 +--
.../springboot/LuceneComponentConverter.java | 24 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../LumberjackComponentAutoConfiguration.java | 5 +--
.../springboot/LumberjackComponentConverter.java | 23 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/MailComponentAutoConfiguration.java | 5 +--
.../mail/springboot/MailComponentConverter.java | 38 ++++++++---------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../MasterComponentAutoConfiguration.java | 5 +--
.../springboot/MasterComponentConverter.java | 24 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../MetricsComponentAutoConfiguration.java | 5 +--
.../springboot/MetricsComponentConverter.java | 22 +++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../MicrometerComponentAutoConfiguration.java | 5 +--
.../springboot/MicrometerComponentConverter.java | 23 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../MiloClientComponentAutoConfiguration.java | 5 +--
.../springboot/MiloClientComponentConverter.java | 23 ++++++-----
.../MiloServerComponentAutoConfiguration.java | 5 +--
.../springboot/MiloServerComponentConverter.java | 29 ++++++-------
.../src/main/resources/META-INF/spring.factories | 6 ++-
.../springboot/MinaComponentAutoConfiguration.java | 5 +--
.../mina/springboot/MinaComponentConverter.java | 26 ++++++------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../MinioComponentAutoConfiguration.java | 5 +--
.../minio/springboot/MinioComponentConverter.java | 32 ++++++++-------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/MllpComponentAutoConfiguration.java | 5 +--
.../mllp/springboot/MllpComponentConverter.java | 22 +++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/MockComponentAutoConfiguration.java | 3 +-
.../GridFsComponentAutoConfiguration.java | 3 +-
.../MongoDbComponentAutoConfiguration.java | 5 +--
.../springboot/MongoDbComponentConverter.java | 22 +++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/MsvComponentAutoConfiguration.java | 5 +--
.../msv/springboot/MsvComponentConverter.java | 24 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../MustacheComponentAutoConfiguration.java | 5 +--
.../springboot/MustacheComponentConverter.java | 22 +++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/MvelComponentAutoConfiguration.java | 3 +-
.../MyBatisBeanComponentAutoConfiguration.java | 5 +--
.../springboot/MyBatisBeanComponentConverter.java | 23 ++++++-----
.../MyBatisComponentAutoConfiguration.java | 5 +--
.../springboot/MyBatisComponentConverter.java | 22 +++++-----
.../src/main/resources/META-INF/spring.factories | 6 ++-
.../NagiosComponentAutoConfiguration.java | 5 +--
.../springboot/NagiosComponentConverter.java | 22 +++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/NatsComponentAutoConfiguration.java | 3 +-
.../NettyHttpComponentAutoConfiguration.java | 5 +--
.../springboot/NettyHttpComponentConverter.java | 47 +++++++++++-----------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../NettyComponentAutoConfiguration.java | 5 +--
.../netty/springboot/NettyComponentConverter.java | 40 +++++++++---------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../NitriteComponentAutoConfiguration.java | 3 +-
.../springboot/NsqComponentAutoConfiguration.java | 3 +-
.../OAIPMHComponentAutoConfiguration.java | 3 +-
.../Olingo2ComponentAutoConfiguration.java | 5 +--
.../springboot/Olingo2ComponentConverter.java | 34 ++++++++--------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../Olingo4ComponentAutoConfiguration.java | 5 +--
.../springboot/Olingo4ComponentConverter.java | 30 +++++++-------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../CinderComponentAutoConfiguration.java | 3 +-
.../GlanceComponentAutoConfiguration.java | 3 +-
.../KeystoneComponentAutoConfiguration.java | 3 +-
.../NeutronComponentAutoConfiguration.java | 3 +-
.../springboot/NovaComponentAutoConfiguration.java | 3 +-
.../SwiftComponentAutoConfiguration.java | 3 +-
.../OptaPlannerComponentAutoConfiguration.java | 3 +-
.../springboot/PahoComponentAutoConfiguration.java | 5 +--
.../paho/springboot/PahoComponentConverter.java | 30 +++++++-------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/PdfComponentAutoConfiguration.java | 3 +-
...gReplicationSlotComponentAutoConfiguration.java | 3 +-
.../PgEventComponentAutoConfiguration.java | 3 +-
.../PlatformHttpComponentAutoConfiguration.java | 5 +--
.../springboot/PlatformHttpComponentConverter.java | 23 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../PrinterComponentAutoConfiguration.java | 3 +-
.../PubNubComponentAutoConfiguration.java | 3 +-
.../PulsarComponentAutoConfiguration.java | 5 +--
.../springboot/PulsarComponentConverter.java | 32 ++++++++-------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../QuartzComponentAutoConfiguration.java | 5 +--
.../springboot/QuartzComponentConverter.java | 24 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../QuickfixjComponentAutoConfiguration.java | 5 +--
.../springboot/QuickfixjComponentConverter.java | 27 +++++++------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../RabbitMQComponentAutoConfiguration.java | 5 +--
.../springboot/RabbitMQComponentConverter.java | 26 ++++++------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../ReactiveStreamsComponentAutoConfiguration.java | 5 +--
.../ReactiveStreamsComponentConverter.java | 23 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/RefComponentAutoConfiguration.java | 3 +-
.../RestOpenApiComponentAutoConfiguration.java | 5 +--
.../springboot/RestOpenApiComponentConverter.java | 23 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../RestApiComponentAutoConfiguration.java | 3 +-
.../springboot/RestComponentAutoConfiguration.java | 3 +-
.../RestSwaggerComponentAutoConfiguration.java | 5 +--
.../springboot/RestSwaggerComponentConverter.java | 23 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../ResteasyComponentAutoConfiguration.java | 5 +--
.../springboot/ResteasyComponentConverter.java | 22 +++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../RobotFrameworkComponentAutoConfiguration.java | 5 +--
.../RobotFrameworkComponentConverter.java | 23 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/RssComponentAutoConfiguration.java | 3 +-
.../springboot/SagaComponentAutoConfiguration.java | 3 +-
.../SalesforceComponentAutoConfiguration.java | 5 +--
.../springboot/SalesforceComponentConverter.java | 35 ++++++++--------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../NetWeaverComponentAutoConfiguration.java | 3 +-
.../XQueryComponentAutoConfiguration.java | 5 +--
.../springboot/XQueryComponentConverter.java | 24 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../SchedulerComponentAutoConfiguration.java | 3 +-
.../SchematronComponentAutoConfiguration.java | 3 +-
.../springboot/SedaComponentAutoConfiguration.java | 5 +--
.../seda/springboot/SedaComponentConverter.java | 22 +++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../ServiceComponentAutoConfiguration.java | 5 +--
.../springboot/ServiceComponentConverter.java | 24 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../ServiceNowComponentAutoConfiguration.java | 5 +--
.../springboot/ServiceNowComponentConverter.java | 31 +++++++-------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../ServletComponentAutoConfiguration.java | 5 +--
.../springboot/ServletComponentConverter.java | 28 +++++++------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/SipComponentAutoConfiguration.java | 3 +-
.../SjmsBatchComponentAutoConfiguration.java | 5 +--
.../springboot/SjmsBatchComponentConverter.java | 25 ++++++------
.../springboot/SjmsComponentAutoConfiguration.java | 5 +--
.../sjms/springboot/SjmsComponentConverter.java | 36 +++++++++--------
.../src/main/resources/META-INF/spring.factories | 6 ++-
.../Sjms2ComponentAutoConfiguration.java | 5 +--
.../sjms2/springboot/Sjms2ComponentConverter.java | 36 +++++++++--------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../SlackComponentAutoConfiguration.java | 3 +-
.../springboot/SmppComponentAutoConfiguration.java | 5 +--
.../smpp/springboot/SmppComponentConverter.java | 24 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/SnmpComponentAutoConfiguration.java | 3 +-
.../springboot/SolrComponentAutoConfiguration.java | 3 +-
.../SoroushBotComponentAutoConfiguration.java | 3 +-
.../SparkComponentAutoConfiguration.java | 5 +--
.../spark/springboot/SparkComponentConverter.java | 24 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../SplunkComponentAutoConfiguration.java | 5 +--
.../springboot/SplunkComponentConverter.java | 22 +++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../SpringBatchComponentAutoConfiguration.java | 5 +--
.../springboot/SpringBatchComponentConverter.java | 25 ++++++------
.../src/main/resources/META-INF/spring.factories | 4 +-
...pringIntegrationComponentAutoConfiguration.java | 3 +-
.../SpringLdapComponentAutoConfiguration.java | 3 +-
.../RedisComponentAutoConfiguration.java | 3 +-
.../EventComponentAutoConfiguration.java | 3 +-
...SpringWebserviceComponentAutoConfiguration.java | 3 +-
.../springboot/SqlComponentAutoConfiguration.java | 5 +--
.../sql/springboot/SqlComponentConverter.java | 22 +++++-----
.../SqlStoredComponentAutoConfiguration.java | 5 +--
.../springboot/SqlStoredComponentConverter.java | 23 ++++++-----
.../src/main/resources/META-INF/spring.factories | 6 ++-
.../springboot/SshComponentAutoConfiguration.java | 5 +--
.../ssh/springboot/SshComponentConverter.java | 24 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/StAXComponentAutoConfiguration.java | 3 +-
.../StompComponentAutoConfiguration.java | 5 +--
.../stomp/springboot/StompComponentConverter.java | 28 +++++++------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../StreamComponentAutoConfiguration.java | 3 +-
.../StringTemplateComponentAutoConfiguration.java | 3 +-
.../springboot/StubComponentAutoConfiguration.java | 5 +--
.../stub/springboot/StubComponentConverter.java | 22 +++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../TelegramComponentAutoConfiguration.java | 5 +--
.../springboot/TelegramComponentConverter.java | 24 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../ThriftComponentAutoConfiguration.java | 3 +-
.../springboot/TikaComponentAutoConfiguration.java | 3 +-
.../TimerComponentAutoConfiguration.java | 3 +-
.../TwilioComponentAutoConfiguration.java | 5 +--
.../springboot/TwilioComponentConverter.java | 24 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
...terDirectMessageComponentAutoConfiguration.java | 3 +-
.../TwitterSearchComponentAutoConfiguration.java | 3 +-
.../TwitterTimelineComponentAutoConfiguration.java | 3 +-
.../UndertowComponentAutoConfiguration.java | 5 +--
.../springboot/UndertowComponentConverter.java | 28 +++++++------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../ValidatorComponentAutoConfiguration.java | 5 +--
.../springboot/ValidatorComponentConverter.java | 23 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../VelocityComponentAutoConfiguration.java | 5 +--
.../springboot/VelocityComponentConverter.java | 22 +++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../VertxHttpComponentAutoConfiguration.java | 5 +--
.../springboot/VertxHttpComponentConverter.java | 31 +++++++-------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../VertxKafkaComponentAutoConfiguration.java | 5 +--
.../springboot/VertxKafkaComponentConverter.java | 29 ++++++-------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../VertxComponentAutoConfiguration.java | 5 +--
.../vertx/springboot/VertxComponentConverter.java | 26 ++++++------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../VertxWebsocketComponentAutoConfiguration.java | 5 +--
.../VertxWebsocketComponentConverter.java | 27 +++++++------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/VmComponentAutoConfiguration.java | 5 +--
.../vm/springboot/VmComponentConverter.java | 22 +++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../WeatherComponentAutoConfiguration.java | 3 +-
.../Web3jComponentAutoConfiguration.java | 5 +--
.../web3j/springboot/Web3jComponentConverter.java | 26 ++++++------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../WebhookComponentAutoConfiguration.java | 5 +--
.../springboot/WebhookComponentConverter.java | 22 +++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../JSR356WebSocketComponentAutoConfiguration.java | 5 +--
.../JSR356WebSocketComponentConverter.java | 23 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../WebsocketComponentAutoConfiguration.java | 5 +--
.../springboot/WebsocketComponentConverter.java | 25 ++++++------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/WekaComponentAutoConfiguration.java | 3 +-
.../WordpressComponentAutoConfiguration.java | 5 +--
.../springboot/WordpressComponentConverter.java | 25 ++++++------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../WorkdayComponentAutoConfiguration.java | 3 +-
.../XChangeComponentAutoConfiguration.java | 3 +-
.../springboot/XJComponentAutoConfiguration.java | 5 +--
.../xj/springboot/XJComponentConverter.java | 28 +++++++------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../XmlSignerComponentAutoConfiguration.java | 5 +--
.../springboot/XmlSignerComponentConverter.java | 33 +++++++--------
.../XmlVerifierComponentAutoConfiguration.java | 5 +--
.../springboot/XmlVerifierComponentConverter.java | 33 +++++++--------
.../src/main/resources/META-INF/spring.factories | 6 ++-
.../springboot/XmppComponentAutoConfiguration.java | 3 +-
.../XsltSaxonComponentAutoConfiguration.java | 5 +--
.../springboot/XsltSaxonComponentConverter.java | 29 ++++++-------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../springboot/XsltComponentAutoConfiguration.java | 5 +--
.../xslt/springboot/XsltComponentConverter.java | 26 ++++++------
.../src/main/resources/META-INF/spring.factories | 4 +-
.../YammerComponentAutoConfiguration.java | 5 +--
.../springboot/YammerComponentConverter.java | 24 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../ZendeskComponentAutoConfiguration.java | 5 +--
.../springboot/ZendeskComponentConverter.java | 24 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../MasterComponentAutoConfiguration.java | 5 +--
.../springboot/MasterComponentConverter.java | 24 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
.../ZooKeeperComponentAutoConfiguration.java | 5 +--
.../springboot/ZooKeeperComponentConverter.java | 23 ++++++-----
.../src/main/resources/META-INF/spring.factories | 4 +-
728 files changed, 3827 insertions(+), 3823 deletions(-)
diff --git a/components-starter/camel-apns-starter/src/main/java/org/apache/camel/component/apns/springboot/ApnsComponentAutoConfiguration.java b/components-starter/camel-apns-starter/src/main/java/org/apache/camel/component/apns/springboot/ApnsComponentAutoConfiguration.java
index 077a6b4..d403268 100644
--- a/components-starter/camel-apns-starter/src/main/java/org/apache/camel/component/apns/springboot/ApnsComponentAutoConfiguration.java
+++ b/components-starter/camel-apns-starter/src/main/java/org/apache/camel/component/apns/springboot/ApnsComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,ApnsComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.apns"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, ApnsComponentConverter.class})
public class ApnsComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class ApnsComponentAutoConfiguration {
public ApnsComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new ApnsComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-apns-starter/src/main/java/org/apache/camel/component/apns/springboot/ApnsComponentConverter.java b/components-starter/camel-apns-starter/src/main/java/org/apache/camel/component/apns/springboot/ApnsComponentConverter.java
index db46b6d..cb57641 100644
--- a/components-starter/camel-apns-starter/src/main/java/org/apache/camel/component/apns/springboot/ApnsComponentConverter.java
+++ b/components-starter/camel-apns-starter/src/main/java/org/apache/camel/component/apns/springboot/ApnsComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.apns.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class ApnsComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class ApnsComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public ApnsComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -56,7 +58,7 @@ public class ApnsComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "com.notnoop.apns.ApnsService": return camelContext.getRegistry().lookupByNameAndType(ref, com.notnoop.apns.ApnsService.class);
+ case "com.notnoop.apns.ApnsService": return applicationContext.getBean(ref, com.notnoop.apns.ApnsService.class);
}
return null;
}
diff --git a/components-starter/camel-apns-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-apns-starter/src/main/resources/META-INF/spring.factories
index 2f5dba0..dc982a9 100644
--- a/components-starter/camel-apns-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-apns-starter/src/main/resources/META-INF/spring.factories
@@ -15,4 +15,6 @@
## limitations under the License.
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.apns.springboot.ApnsComponentAutoConfiguration
+org.apache.camel.component.apns.springboot.ApnsComponentAutoConfiguration,\
+org.apache.camel.component.apns.springboot.ApnsComponentConverter
+
diff --git a/components-starter/camel-arangodb-starter/src/main/java/org/apache/camel/component/arangodb/springboot/ArangoDbComponentAutoConfiguration.java b/components-starter/camel-arangodb-starter/src/main/java/org/apache/camel/component/arangodb/springboot/ArangoDbComponentAutoConfiguration.java
index 295fb93..b71a314 100644
--- a/components-starter/camel-arangodb-starter/src/main/java/org/apache/camel/component/arangodb/springboot/ArangoDbComponentAutoConfiguration.java
+++ b/components-starter/camel-arangodb-starter/src/main/java/org/apache/camel/component/arangodb/springboot/ArangoDbComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,ArangoDbComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.arangodb"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, ArangoDbComponentConverter.class})
public class ArangoDbComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class ArangoDbComponentAutoConfiguration {
public ArangoDbComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new ArangoDbComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-arangodb-starter/src/main/java/org/apache/camel/component/arangodb/springboot/ArangoDbComponentConverter.java b/components-starter/camel-arangodb-starter/src/main/java/org/apache/camel/component/arangodb/springboot/ArangoDbComponentConverter.java
index f58ad64..42c12d3 100644
--- a/components-starter/camel-arangodb-starter/src/main/java/org/apache/camel/component/arangodb/springboot/ArangoDbComponentConverter.java
+++ b/components-starter/camel-arangodb-starter/src/main/java/org/apache/camel/component/arangodb/springboot/ArangoDbComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.arangodb.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class ArangoDbComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class ArangoDbComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public ArangoDbComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -56,7 +58,7 @@ public class ArangoDbComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "org.apache.camel.component.arangodb.ArangoDbConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.arangodb.ArangoDbConfiguration.class);
+ case "org.apache.camel.component.arangodb.ArangoDbConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.arangodb.ArangoDbConfiguration.class);
}
return null;
}
diff --git a/components-starter/camel-arangodb-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-arangodb-starter/src/main/resources/META-INF/spring.factories
index a4a2f2a..c9230f3 100644
--- a/components-starter/camel-arangodb-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-arangodb-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.arangodb.springboot.ArangoDbComponentAutoConfiguration
+org.apache.camel.component.arangodb.springboot.ArangoDbComponentAutoConfiguration,\
+org.apache.camel.component.arangodb.springboot.ArangoDbComponentConverter
+
diff --git a/components-starter/camel-as2-starter/src/main/java/org/apache/camel/component/as2/springboot/AS2ComponentAutoConfiguration.java b/components-starter/camel-as2-starter/src/main/java/org/apache/camel/component/as2/springboot/AS2ComponentAutoConfiguration.java
index 6589024..2b593ec 100644
--- a/components-starter/camel-as2-starter/src/main/java/org/apache/camel/component/as2/springboot/AS2ComponentAutoConfiguration.java
+++ b/components-starter/camel-as2-starter/src/main/java/org/apache/camel/component/as2/springboot/AS2ComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,AS2ComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.as2"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, AS2ComponentConverter.class})
public class AS2ComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class AS2ComponentAutoConfiguration {
public AS2ComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new AS2ComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-as2-starter/src/main/java/org/apache/camel/component/as2/springboot/AS2ComponentConverter.java b/components-starter/camel-as2-starter/src/main/java/org/apache/camel/component/as2/springboot/AS2ComponentConverter.java
index a3c6d8f..a18b7ba 100644
--- a/components-starter/camel-as2-starter/src/main/java/org/apache/camel/component/as2/springboot/AS2ComponentConverter.java
+++ b/components-starter/camel-as2-starter/src/main/java/org/apache/camel/component/as2/springboot/AS2ComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.as2.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class AS2ComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class AS2ComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public AS2ComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -56,7 +58,7 @@ public class AS2ComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "org.apache.camel.component.as2.AS2Configuration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.as2.AS2Configuration.class);
+ case "org.apache.camel.component.as2.AS2Configuration": return applicationContext.getBean(ref, org.apache.camel.component.as2.AS2Configuration.class);
}
return null;
}
diff --git a/components-starter/camel-as2-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-as2-starter/src/main/resources/META-INF/spring.factories
index 7bd3a82..d974663 100644
--- a/components-starter/camel-as2-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-as2-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.as2.springboot.AS2ComponentAutoConfiguration
+org.apache.camel.component.as2.springboot.AS2ComponentAutoConfiguration,\
+org.apache.camel.component.as2.springboot.AS2ComponentConverter
+
diff --git a/components-starter/camel-asterisk-starter/src/main/java/org/apache/camel/component/asterisk/springboot/AsteriskComponentAutoConfiguration.java b/components-starter/camel-asterisk-starter/src/main/java/org/apache/camel/component/asterisk/springboot/AsteriskComponentAutoConfiguration.java
index 4b4668b..cdc40ba 100644
--- a/components-starter/camel-asterisk-starter/src/main/java/org/apache/camel/component/asterisk/springboot/AsteriskComponentAutoConfiguration.java
+++ b/components-starter/camel-asterisk-starter/src/main/java/org/apache/camel/component/asterisk/springboot/AsteriskComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,AsteriskComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.asterisk"})
+@AutoConfigureAfter(CamelAutoConfiguration.class)
public class AsteriskComponentAutoConfiguration {
@Autowired
diff --git a/components-starter/camel-atlasmap-starter/src/main/java/org/apache/camel/component/atlasmap/springboot/AtlasMapComponentAutoConfiguration.java b/components-starter/camel-atlasmap-starter/src/main/java/org/apache/camel/component/atlasmap/springboot/AtlasMapComponentAutoConfiguration.java
index b143328..88fdb1d 100644
--- a/components-starter/camel-atlasmap-starter/src/main/java/org/apache/camel/component/atlasmap/springboot/AtlasMapComponentAutoConfiguration.java
+++ b/components-starter/camel-atlasmap-starter/src/main/java/org/apache/camel/component/atlasmap/springboot/AtlasMapComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,AtlasMapComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.atlasmap"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, AtlasMapComponentConverter.class})
public class AtlasMapComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class AtlasMapComponentAutoConfiguration {
public AtlasMapComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new AtlasMapComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-atlasmap-starter/src/main/java/org/apache/camel/component/atlasmap/springboot/AtlasMapComponentConverter.java b/components-starter/camel-atlasmap-starter/src/main/java/org/apache/camel/component/atlasmap/springboot/AtlasMapComponentConverter.java
index 6a7783a..98a9054 100644
--- a/components-starter/camel-atlasmap-starter/src/main/java/org/apache/camel/component/atlasmap/springboot/AtlasMapComponentConverter.java
+++ b/components-starter/camel-atlasmap-starter/src/main/java/org/apache/camel/component/atlasmap/springboot/AtlasMapComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.atlasmap.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class AtlasMapComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class AtlasMapComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public AtlasMapComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -56,7 +58,7 @@ public class AtlasMapComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "io.atlasmap.api.AtlasContextFactory": return camelContext.getRegistry().lookupByNameAndType(ref, io.atlasmap.api.AtlasContextFactory.class);
+ case "io.atlasmap.api.AtlasContextFactory": return applicationContext.getBean(ref, io.atlasmap.api.AtlasContextFactory.class);
}
return null;
}
diff --git a/components-starter/camel-atlasmap-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-atlasmap-starter/src/main/resources/META-INF/spring.factories
index 5001d0e..328e8e5 100644
--- a/components-starter/camel-atlasmap-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-atlasmap-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.atlasmap.springboot.AtlasMapComponentAutoConfiguration
+org.apache.camel.component.atlasmap.springboot.AtlasMapComponentAutoConfiguration,\
+org.apache.camel.component.atlasmap.springboot.AtlasMapComponentConverter
+
diff --git a/components-starter/camel-atmos-starter/src/main/java/org/apache/camel/component/atmos/springboot/AtmosComponentAutoConfiguration.java b/components-starter/camel-atmos-starter/src/main/java/org/apache/camel/component/atmos/springboot/AtmosComponentAutoConfiguration.java
index b08e9c2..6252067 100644
--- a/components-starter/camel-atmos-starter/src/main/java/org/apache/camel/component/atmos/springboot/AtmosComponentAutoConfiguration.java
+++ b/components-starter/camel-atmos-starter/src/main/java/org/apache/camel/component/atmos/springboot/AtmosComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,AtmosComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.atmos"})
+@AutoConfigureAfter(CamelAutoConfiguration.class)
public class AtmosComponentAutoConfiguration {
@Autowired
diff --git a/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentAutoConfiguration.java b/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentAutoConfiguration.java
index bb610a5..0566f20 100644
--- a/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentAutoConfiguration.java
+++ b/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,WebsocketComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.atmosphere-websocket"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, WebsocketComponentConverter.class})
public class WebsocketComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class WebsocketComponentAutoConfiguration {
public WebsocketComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new WebsocketComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentConverter.java b/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentConverter.java
index 4215db3..1cc764c 100644
--- a/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentConverter.java
+++ b/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentConverter.java
@@ -19,24 +19,25 @@ package org.apache.camel.component.atmosphere.websocket.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class WebsocketComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class WebsocketComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public WebsocketComponentConverter(
- org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -60,10 +61,10 @@ public class WebsocketComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "org.apache.camel.http.common.HttpRegistry": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.http.common.HttpRegistry.class);
- case "org.apache.camel.http.common.HttpBinding": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.http.common.HttpBinding.class);
- case "org.apache.camel.http.common.HttpConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.http.common.HttpConfiguration.class);
- case "org.apache.camel.spi.HeaderFilterStrategy": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.spi.HeaderFilterStrategy.class);
+ case "org.apache.camel.http.common.HttpRegistry": return applicationContext.getBean(ref, org.apache.camel.http.common.HttpRegistry.class);
+ case "org.apache.camel.http.common.HttpBinding": return applicationContext.getBean(ref, org.apache.camel.http.common.HttpBinding.class);
+ case "org.apache.camel.http.common.HttpConfiguration": return applicationContext.getBean(ref, org.apache.camel.http.common.HttpConfiguration.class);
+ case "org.apache.camel.spi.HeaderFilterStrategy": return applicationContext.getBean(ref, org.apache.camel.spi.HeaderFilterStrategy.class);
}
return null;
}
diff --git a/components-starter/camel-atmosphere-websocket-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-atmosphere-websocket-starter/src/main/resources/META-INF/spring.factories
index 7a94542..8659d6d 100644
--- a/components-starter/camel-atmosphere-websocket-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-atmosphere-websocket-starter/src/main/resources/META-INF/spring.factories
@@ -15,4 +15,6 @@
## limitations under the License.
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.atmosphere.websocket.springboot.WebsocketComponentAutoConfiguration
+org.apache.camel.component.atmosphere.websocket.springboot.WebsocketComponentAutoConfiguration,\
+org.apache.camel.component.atmosphere.websocket.springboot.WebsocketComponentConverter
+
diff --git a/components-starter/camel-atom-starter/src/main/java/org/apache/camel/component/atom/springboot/AtomComponentAutoConfiguration.java b/components-starter/camel-atom-starter/src/main/java/org/apache/camel/component/atom/springboot/AtomComponentAutoConfiguration.java
index bd4e250..d78b74a 100644
--- a/components-starter/camel-atom-starter/src/main/java/org/apache/camel/component/atom/springboot/AtomComponentAutoConfiguration.java
+++ b/components-starter/camel-atom-starter/src/main/java/org/apache/camel/component/atom/springboot/AtomComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,AtomComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.atom"})
+@AutoConfigureAfter(CamelAutoConfiguration.class)
public class AtomComponentAutoConfiguration {
@Autowired
diff --git a/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/map/springboot/AtomixMapComponentAutoConfiguration.java b/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/map/springboot/AtomixMapComponentAutoConfiguration.java
index a35edb2..5779ebe 100644
--- a/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/map/springboot/AtomixMapComponentAutoConfiguration.java
+++ b/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/map/springboot/AtomixMapComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,AtomixMapComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.atomix-map"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, AtomixMapComponentConverter.class})
public class AtomixMapComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class AtomixMapComponentAutoConfiguration {
public AtomixMapComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new AtomixMapComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/map/springboot/AtomixMapComponentConverter.java b/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/map/springboot/AtomixMapComponentConverter.java
index 23bf4be..0ad46f3 100644
--- a/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/map/springboot/AtomixMapComponentConverter.java
+++ b/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/map/springboot/AtomixMapComponentConverter.java
@@ -19,24 +19,25 @@ package org.apache.camel.component.atomix.client.map.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class AtomixMapComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class AtomixMapComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public AtomixMapComponentConverter(
- org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -59,9 +60,9 @@ public class AtomixMapComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "io.atomix.Atomix": return camelContext.getRegistry().lookupByNameAndType(ref, io.atomix.Atomix.class);
- case "org.apache.camel.component.atomix.client.map.AtomixMapConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.atomix.client.map.AtomixMapConfiguration.class);
- case "java.util.Properties": return camelContext.getRegistry().lookupByNameAndType(ref, java.util.Properties.class);
+ case "io.atomix.Atomix": return applicationContext.getBean(ref, io.atomix.Atomix.class);
+ case "org.apache.camel.component.atomix.client.map.AtomixMapConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.atomix.client.map.AtomixMapConfiguration.class);
+ case "java.util.Properties": return applicationContext.getBean(ref, java.util.Properties.class);
}
return null;
}
diff --git a/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/messaging/springboot/AtomixMessagingComponentAutoConfiguration.java b/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/messaging/springboot/AtomixMessagingComponentAutoConfiguration.java
index d0a0c6f..5805227 100644
--- a/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/messaging/springboot/AtomixMessagingComponentAutoConfiguration.java
+++ b/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/messaging/springboot/AtomixMessagingComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,AtomixMessagingComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.atomix-messaging"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, AtomixMessagingComponentConverter.class})
public class AtomixMessagingComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class AtomixMessagingComponentAutoConfiguration {
public AtomixMessagingComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new AtomixMessagingComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/messaging/springboot/AtomixMessagingComponentConverter.java b/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/messaging/springboot/AtomixMessagingComponentConverter.java
index 0f2b5ab..528c3ef 100644
--- a/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/messaging/springboot/AtomixMessagingComponentConverter.java
+++ b/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/messaging/springboot/AtomixMessagingComponentConverter.java
@@ -19,24 +19,25 @@ package org.apache.camel.component.atomix.client.messaging.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class AtomixMessagingComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class AtomixMessagingComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public AtomixMessagingComponentConverter(
- org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -59,9 +60,9 @@ public class AtomixMessagingComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "io.atomix.Atomix": return camelContext.getRegistry().lookupByNameAndType(ref, io.atomix.Atomix.class);
- case "org.apache.camel.component.atomix.client.messaging.AtomixMessagingConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.atomix.client.messaging.AtomixMessagingConfiguration.class);
- case "java.util.Properties": return camelContext.getRegistry().lookupByNameAndType(ref, java.util.Properties.class);
+ case "io.atomix.Atomix": return applicationContext.getBean(ref, io.atomix.Atomix.class);
+ case "org.apache.camel.component.atomix.client.messaging.AtomixMessagingConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.atomix.client.messaging.AtomixMessagingConfiguration.class);
+ case "java.util.Properties": return applicationContext.getBean(ref, java.util.Properties.class);
}
return null;
}
diff --git a/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/multimap/springboot/AtomixMultiMapComponentAutoConfiguration.java b/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/multimap/springboot/AtomixMultiMapComponentAutoConfiguration.java
index 52e1f8c..7c671b9 100644
--- a/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/multimap/springboot/AtomixMultiMapComponentAutoConfiguration.java
+++ b/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/multimap/springboot/AtomixMultiMapComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,AtomixMultiMapComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.atomix-multimap"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, AtomixMultiMapComponentConverter.class})
public class AtomixMultiMapComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class AtomixMultiMapComponentAutoConfiguration {
public AtomixMultiMapComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new AtomixMultiMapComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/multimap/springboot/AtomixMultiMapComponentConverter.java b/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/multimap/springboot/AtomixMultiMapComponentConverter.java
index 49f7432..28dcc01 100644
--- a/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/multimap/springboot/AtomixMultiMapComponentConverter.java
+++ b/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/multimap/springboot/AtomixMultiMapComponentConverter.java
@@ -19,24 +19,25 @@ package org.apache.camel.component.atomix.client.multimap.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class AtomixMultiMapComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class AtomixMultiMapComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public AtomixMultiMapComponentConverter(
- org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -59,9 +60,9 @@ public class AtomixMultiMapComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "io.atomix.Atomix": return camelContext.getRegistry().lookupByNameAndType(ref, io.atomix.Atomix.class);
- case "org.apache.camel.component.atomix.client.multimap.AtomixMultiMapConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.atomix.client.multimap.AtomixMultiMapConfiguration.class);
- case "java.util.Properties": return camelContext.getRegistry().lookupByNameAndType(ref, java.util.Properties.class);
+ case "io.atomix.Atomix": return applicationContext.getBean(ref, io.atomix.Atomix.class);
+ case "org.apache.camel.component.atomix.client.multimap.AtomixMultiMapConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.atomix.client.multimap.AtomixMultiMapConfiguration.class);
+ case "java.util.Properties": return applicationContext.getBean(ref, java.util.Properties.class);
}
return null;
}
diff --git a/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/queue/springboot/AtomixQueueComponentAutoConfiguration.java b/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/queue/springboot/AtomixQueueComponentAutoConfiguration.java
index 398968a..7ad1067 100644
--- a/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/queue/springboot/AtomixQueueComponentAutoConfiguration.java
+++ b/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/queue/springboot/AtomixQueueComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,AtomixQueueComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.atomix-queue"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, AtomixQueueComponentConverter.class})
public class AtomixQueueComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class AtomixQueueComponentAutoConfiguration {
public AtomixQueueComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new AtomixQueueComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/queue/springboot/AtomixQueueComponentConverter.java b/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/queue/springboot/AtomixQueueComponentConverter.java
index 7e7234f..4013b20 100644
--- a/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/queue/springboot/AtomixQueueComponentConverter.java
+++ b/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/queue/springboot/AtomixQueueComponentConverter.java
@@ -19,24 +19,25 @@ package org.apache.camel.component.atomix.client.queue.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class AtomixQueueComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class AtomixQueueComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public AtomixQueueComponentConverter(
- org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -59,9 +60,9 @@ public class AtomixQueueComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "io.atomix.Atomix": return camelContext.getRegistry().lookupByNameAndType(ref, io.atomix.Atomix.class);
- case "org.apache.camel.component.atomix.client.queue.AtomixQueueConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.atomix.client.queue.AtomixQueueConfiguration.class);
- case "java.util.Properties": return camelContext.getRegistry().lookupByNameAndType(ref, java.util.Properties.class);
+ case "io.atomix.Atomix": return applicationContext.getBean(ref, io.atomix.Atomix.class);
+ case "org.apache.camel.component.atomix.client.queue.AtomixQueueConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.atomix.client.queue.AtomixQueueConfiguration.class);
+ case "java.util.Properties": return applicationContext.getBean(ref, java.util.Properties.class);
}
return null;
}
diff --git a/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/set/springboot/AtomixSetComponentAutoConfiguration.java b/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/set/springboot/AtomixSetComponentAutoConfiguration.java
index bdc30d9..b58c92d 100644
--- a/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/set/springboot/AtomixSetComponentAutoConfiguration.java
+++ b/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/set/springboot/AtomixSetComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,AtomixSetComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.atomix-set"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, AtomixSetComponentConverter.class})
public class AtomixSetComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class AtomixSetComponentAutoConfiguration {
public AtomixSetComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new AtomixSetComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/set/springboot/AtomixSetComponentConverter.java b/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/set/springboot/AtomixSetComponentConverter.java
index 7e377ef..acdb22a 100644
--- a/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/set/springboot/AtomixSetComponentConverter.java
+++ b/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/set/springboot/AtomixSetComponentConverter.java
@@ -19,24 +19,25 @@ package org.apache.camel.component.atomix.client.set.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class AtomixSetComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class AtomixSetComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public AtomixSetComponentConverter(
- org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -59,9 +60,9 @@ public class AtomixSetComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "io.atomix.Atomix": return camelContext.getRegistry().lookupByNameAndType(ref, io.atomix.Atomix.class);
- case "org.apache.camel.component.atomix.client.set.AtomixSetConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.atomix.client.set.AtomixSetConfiguration.class);
- case "java.util.Properties": return camelContext.getRegistry().lookupByNameAndType(ref, java.util.Properties.class);
+ case "io.atomix.Atomix": return applicationContext.getBean(ref, io.atomix.Atomix.class);
+ case "org.apache.camel.component.atomix.client.set.AtomixSetConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.atomix.client.set.AtomixSetConfiguration.class);
+ case "java.util.Properties": return applicationContext.getBean(ref, java.util.Properties.class);
}
return null;
}
diff --git a/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/value/springboot/AtomixValueComponentAutoConfiguration.java b/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/value/springboot/AtomixValueComponentAutoConfiguration.java
index 4a80aaf..d4dc121 100644
--- a/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/value/springboot/AtomixValueComponentAutoConfiguration.java
+++ b/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/value/springboot/AtomixValueComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,AtomixValueComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.atomix-value"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, AtomixValueComponentConverter.class})
public class AtomixValueComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class AtomixValueComponentAutoConfiguration {
public AtomixValueComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new AtomixValueComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/value/springboot/AtomixValueComponentConverter.java b/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/value/springboot/AtomixValueComponentConverter.java
index a16a4af..0653bd8 100644
--- a/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/value/springboot/AtomixValueComponentConverter.java
+++ b/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/value/springboot/AtomixValueComponentConverter.java
@@ -19,24 +19,25 @@ package org.apache.camel.component.atomix.client.value.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class AtomixValueComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class AtomixValueComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public AtomixValueComponentConverter(
- org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -59,9 +60,9 @@ public class AtomixValueComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "io.atomix.Atomix": return camelContext.getRegistry().lookupByNameAndType(ref, io.atomix.Atomix.class);
- case "org.apache.camel.component.atomix.client.value.AtomixValueConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.atomix.client.value.AtomixValueConfiguration.class);
- case "java.util.Properties": return camelContext.getRegistry().lookupByNameAndType(ref, java.util.Properties.class);
+ case "io.atomix.Atomix": return applicationContext.getBean(ref, io.atomix.Atomix.class);
+ case "org.apache.camel.component.atomix.client.value.AtomixValueConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.atomix.client.value.AtomixValueConfiguration.class);
+ case "java.util.Properties": return applicationContext.getBean(ref, java.util.Properties.class);
}
return null;
}
diff --git a/components-starter/camel-atomix-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-atomix-starter/src/main/resources/META-INF/spring.factories
index 7a4a78c..74a1243 100644
--- a/components-starter/camel-atomix-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-atomix-starter/src/main/resources/META-INF/spring.factories
@@ -28,7 +28,19 @@ org.apache.camel.component.atomix.client.map.springboot.AtomixMapComponentAutoCo
org.apache.camel.component.atomix.client.multimap.springboot.AtomixMultiMapComponentAutoConfiguration,\
org.apache.camel.component.atomix.client.value.springboot.AtomixValueComponentAutoConfiguration,\
org.apache.camel.component.atomix.client.messaging.springboot.AtomixMessagingComponentAutoConfiguration,\
-org.apache.camel.component.atomix.cluster.springboot.AtomixClusterServiceAutoConfiguration
+org.apache.camel.component.atomix.cluster.springboot.AtomixClusterServiceAutoConfiguration,\
+org.apache.camel.component.atomix.client.set.springboot.AtomixSetComponentConverter,\
+org.apache.camel.component.atomix.client.queue.springboot.AtomixQueueComponentConverter,\
+org.apache.camel.component.atomix.client.map.springboot.AtomixMapComponentConverter,\
+org.apache.camel.component.atomix.client.multimap.springboot.AtomixMultiMapComponentConverter,\
+org.apache.camel.component.atomix.client.value.springboot.AtomixValueComponentConverter,\
+org.apache.camel.component.atomix.client.messaging.springboot.AtomixMessagingComponentConverter
+
+
+
+
+
+
diff --git a/components-starter/camel-avro-rpc-starter/src/main/java/org/apache/camel/component/avro/springboot/AvroComponentAutoConfiguration.java b/components-starter/camel-avro-rpc-starter/src/main/java/org/apache/camel/component/avro/springboot/AvroComponentAutoConfiguration.java
index 6c59ead..7341a72 100644
--- a/components-starter/camel-avro-rpc-starter/src/main/java/org/apache/camel/component/avro/springboot/AvroComponentAutoConfiguration.java
+++ b/components-starter/camel-avro-rpc-starter/src/main/java/org/apache/camel/component/avro/springboot/AvroComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,AvroComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.avro"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, AvroComponentConverter.class})
public class AvroComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class AvroComponentAutoConfiguration {
public AvroComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new AvroComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-avro-rpc-starter/src/main/java/org/apache/camel/component/avro/springboot/AvroComponentConverter.java b/components-starter/camel-avro-rpc-starter/src/main/java/org/apache/camel/component/avro/springboot/AvroComponentConverter.java
index 6986a50..4168b79 100644
--- a/components-starter/camel-avro-rpc-starter/src/main/java/org/apache/camel/component/avro/springboot/AvroComponentConverter.java
+++ b/components-starter/camel-avro-rpc-starter/src/main/java/org/apache/camel/component/avro/springboot/AvroComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.avro.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class AvroComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class AvroComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public AvroComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -57,8 +59,8 @@ public class AvroComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "org.apache.avro.Protocol": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.avro.Protocol.class);
- case "org.apache.camel.component.avro.AvroConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.avro.AvroConfiguration.class);
+ case "org.apache.avro.Protocol": return applicationContext.getBean(ref, org.apache.avro.Protocol.class);
+ case "org.apache.camel.component.avro.AvroConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.avro.AvroConfiguration.class);
}
return null;
}
diff --git a/components-starter/camel-avro-rpc-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-avro-rpc-starter/src/main/resources/META-INF/spring.factories
index e27bf36..de23986 100644
--- a/components-starter/camel-avro-rpc-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-avro-rpc-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.avro.springboot.AvroComponentAutoConfiguration
+org.apache.camel.component.avro.springboot.AvroComponentAutoConfiguration,\
+org.apache.camel.component.avro.springboot.AvroComponentConverter
+
diff --git a/components-starter/camel-aws-cw-starter/src/main/java/org/apache/camel/component/aws/cw/springboot/CwComponentAutoConfiguration.java b/components-starter/camel-aws-cw-starter/src/main/java/org/apache/camel/component/aws/cw/springboot/CwComponentAutoConfiguration.java
index 5092e1e..7e194a05 100644
--- a/components-starter/camel-aws-cw-starter/src/main/java/org/apache/camel/component/aws/cw/springboot/CwComponentAutoConfiguration.java
+++ b/components-starter/camel-aws-cw-starter/src/main/java/org/apache/camel/component/aws/cw/springboot/CwComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,CwComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws-cw"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, CwComponentConverter.class})
public class CwComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class CwComponentAutoConfiguration {
public CwComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new CwComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-aws-cw-starter/src/main/java/org/apache/camel/component/aws/cw/springboot/CwComponentConverter.java b/components-starter/camel-aws-cw-starter/src/main/java/org/apache/camel/component/aws/cw/springboot/CwComponentConverter.java
index 944b085..89dc648 100644
--- a/components-starter/camel-aws-cw-starter/src/main/java/org/apache/camel/component/aws/cw/springboot/CwComponentConverter.java
+++ b/components-starter/camel-aws-cw-starter/src/main/java/org/apache/camel/component/aws/cw/springboot/CwComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.aws.cw.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class CwComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class CwComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public CwComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -57,8 +59,8 @@ public class CwComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "com.amazonaws.services.cloudwatch.AmazonCloudWatch": return camelContext.getRegistry().lookupByNameAndType(ref, com.amazonaws.services.cloudwatch.AmazonCloudWatch.class);
- case "org.apache.camel.component.aws.cw.CwConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.aws.cw.CwConfiguration.class);
+ case "com.amazonaws.services.cloudwatch.AmazonCloudWatch": return applicationContext.getBean(ref, com.amazonaws.services.cloudwatch.AmazonCloudWatch.class);
+ case "org.apache.camel.component.aws.cw.CwConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.aws.cw.CwConfiguration.class);
}
return null;
}
diff --git a/components-starter/camel-aws-cw-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-aws-cw-starter/src/main/resources/META-INF/spring.factories
index a0e86a9..b1face9 100644
--- a/components-starter/camel-aws-cw-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-aws-cw-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.aws.cw.springboot.CwComponentAutoConfiguration
+org.apache.camel.component.aws.cw.springboot.CwComponentAutoConfiguration,\
+org.apache.camel.component.aws.cw.springboot.CwComponentConverter
+
diff --git a/components-starter/camel-aws-ddb-starter/src/main/java/org/apache/camel/component/aws/ddb/springboot/DdbComponentAutoConfiguration.java b/components-starter/camel-aws-ddb-starter/src/main/java/org/apache/camel/component/aws/ddb/springboot/DdbComponentAutoConfiguration.java
index 025e053..a8fae4d 100644
--- a/components-starter/camel-aws-ddb-starter/src/main/java/org/apache/camel/component/aws/ddb/springboot/DdbComponentAutoConfiguration.java
+++ b/components-starter/camel-aws-ddb-starter/src/main/java/org/apache/camel/component/aws/ddb/springboot/DdbComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,DdbComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws-ddb"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, DdbComponentConverter.class})
public class DdbComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class DdbComponentAutoConfiguration {
public DdbComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new DdbComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-aws-ddb-starter/src/main/java/org/apache/camel/component/aws/ddb/springboot/DdbComponentConverter.java b/components-starter/camel-aws-ddb-starter/src/main/java/org/apache/camel/component/aws/ddb/springboot/DdbComponentConverter.java
index 79e5750..cacdf35 100644
--- a/components-starter/camel-aws-ddb-starter/src/main/java/org/apache/camel/component/aws/ddb/springboot/DdbComponentConverter.java
+++ b/components-starter/camel-aws-ddb-starter/src/main/java/org/apache/camel/component/aws/ddb/springboot/DdbComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.aws.ddb.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class DdbComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class DdbComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public DdbComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -57,8 +59,8 @@ public class DdbComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "com.amazonaws.services.dynamodbv2.AmazonDynamoDB": return camelContext.getRegistry().lookupByNameAndType(ref, com.amazonaws.services.dynamodbv2.AmazonDynamoDB.class);
- case "org.apache.camel.component.aws.ddb.DdbConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.aws.ddb.DdbConfiguration.class);
+ case "com.amazonaws.services.dynamodbv2.AmazonDynamoDB": return applicationContext.getBean(ref, com.amazonaws.services.dynamodbv2.AmazonDynamoDB.class);
+ case "org.apache.camel.component.aws.ddb.DdbConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.aws.ddb.DdbConfiguration.class);
}
return null;
}
diff --git a/components-starter/camel-aws-ddb-starter/src/main/java/org/apache/camel/component/aws/ddbstream/springboot/DdbStreamComponentAutoConfiguration.java b/components-starter/camel-aws-ddb-starter/src/main/java/org/apache/camel/component/aws/ddbstream/springboot/DdbStreamComponentAutoConfiguration.java
index ced2c59..fd7e88f 100644
--- a/components-starter/camel-aws-ddb-starter/src/main/java/org/apache/camel/component/aws/ddbstream/springboot/DdbStreamComponentAutoConfiguration.java
+++ b/components-starter/camel-aws-ddb-starter/src/main/java/org/apache/camel/component/aws/ddbstream/springboot/DdbStreamComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,DdbStreamComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws-ddbstream"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, DdbStreamComponentConverter.class})
public class DdbStreamComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class DdbStreamComponentAutoConfiguration {
public DdbStreamComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new DdbStreamComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-aws-ddb-starter/src/main/java/org/apache/camel/component/aws/ddbstream/springboot/DdbStreamComponentConverter.java b/components-starter/camel-aws-ddb-starter/src/main/java/org/apache/camel/component/aws/ddbstream/springboot/DdbStreamComponentConverter.java
index a2b96a7..e512de4 100644
--- a/components-starter/camel-aws-ddb-starter/src/main/java/org/apache/camel/component/aws/ddbstream/springboot/DdbStreamComponentConverter.java
+++ b/components-starter/camel-aws-ddb-starter/src/main/java/org/apache/camel/component/aws/ddbstream/springboot/DdbStreamComponentConverter.java
@@ -19,24 +19,25 @@ package org.apache.camel.component.aws.ddbstream.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class DdbStreamComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class DdbStreamComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public DdbStreamComponentConverter(
- org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -59,9 +60,9 @@ public class DdbStreamComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "com.amazonaws.services.dynamodbv2.AmazonDynamoDBStreams": return camelContext.getRegistry().lookupByNameAndType(ref, com.amazonaws.services.dynamodbv2.AmazonDynamoDBStreams.class);
- case "org.apache.camel.component.aws.ddbstream.DdbStreamConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.aws.ddbstream.DdbStreamConfiguration.class);
- case "org.apache.camel.component.aws.ddbstream.SequenceNumberProvider": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.aws.ddbstream.SequenceNumberProvider.class);
+ case "com.amazonaws.services.dynamodbv2.AmazonDynamoDBStreams": return applicationContext.getBean(ref, com.amazonaws.services.dynamodbv2.AmazonDynamoDBStreams.class);
+ case "org.apache.camel.component.aws.ddbstream.DdbStreamConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.aws.ddbstream.DdbStreamConfiguration.class);
+ case "org.apache.camel.component.aws.ddbstream.SequenceNumberProvider": return applicationContext.getBean(ref, org.apache.camel.component.aws.ddbstream.SequenceNumberProvider.class);
}
return null;
}
diff --git a/components-starter/camel-aws-ddb-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-aws-ddb-starter/src/main/resources/META-INF/spring.factories
index ebfa0cb..0f7c71e 100644
--- a/components-starter/camel-aws-ddb-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-aws-ddb-starter/src/main/resources/META-INF/spring.factories
@@ -17,5 +17,9 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
org.apache.camel.component.aws.ddbstream.springboot.DdbStreamComponentAutoConfiguration,\
-org.apache.camel.component.aws.ddb.springboot.DdbComponentAutoConfiguration
+org.apache.camel.component.aws.ddb.springboot.DdbComponentAutoConfiguration,\
+org.apache.camel.component.aws.ddbstream.springboot.DdbStreamComponentConverter,\
+org.apache.camel.component.aws.ddb.springboot.DdbComponentConverter
+
+
diff --git a/components-starter/camel-aws-ec2-starter/src/main/java/org/apache/camel/component/aws/ec2/springboot/EC2ComponentAutoConfiguration.java b/components-starter/camel-aws-ec2-starter/src/main/java/org/apache/camel/component/aws/ec2/springboot/EC2ComponentAutoConfiguration.java
index ed086b7..922d7a1 100644
--- a/components-starter/camel-aws-ec2-starter/src/main/java/org/apache/camel/component/aws/ec2/springboot/EC2ComponentAutoConfiguration.java
+++ b/components-starter/camel-aws-ec2-starter/src/main/java/org/apache/camel/component/aws/ec2/springboot/EC2ComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,EC2ComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws-ec2"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, EC2ComponentConverter.class})
public class EC2ComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class EC2ComponentAutoConfiguration {
public EC2ComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new EC2ComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-aws-ec2-starter/src/main/java/org/apache/camel/component/aws/ec2/springboot/EC2ComponentConverter.java b/components-starter/camel-aws-ec2-starter/src/main/java/org/apache/camel/component/aws/ec2/springboot/EC2ComponentConverter.java
index c32785a..6255c3f 100644
--- a/components-starter/camel-aws-ec2-starter/src/main/java/org/apache/camel/component/aws/ec2/springboot/EC2ComponentConverter.java
+++ b/components-starter/camel-aws-ec2-starter/src/main/java/org/apache/camel/component/aws/ec2/springboot/EC2ComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.aws.ec2.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class EC2ComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class EC2ComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public EC2ComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -57,8 +59,8 @@ public class EC2ComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "com.amazonaws.services.ec2.AmazonEC2": return camelContext.getRegistry().lookupByNameAndType(ref, com.amazonaws.services.ec2.AmazonEC2.class);
- case "org.apache.camel.component.aws.ec2.EC2Configuration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.aws.ec2.EC2Configuration.class);
+ case "com.amazonaws.services.ec2.AmazonEC2": return applicationContext.getBean(ref, com.amazonaws.services.ec2.AmazonEC2.class);
+ case "org.apache.camel.component.aws.ec2.EC2Configuration": return applicationContext.getBean(ref, org.apache.camel.component.aws.ec2.EC2Configuration.class);
}
return null;
}
diff --git a/components-starter/camel-aws-ec2-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-aws-ec2-starter/src/main/resources/META-INF/spring.factories
index 1a25ffc..c4ad7ff 100644
--- a/components-starter/camel-aws-ec2-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-aws-ec2-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.aws.ec2.springboot.EC2ComponentAutoConfiguration
+org.apache.camel.component.aws.ec2.springboot.EC2ComponentAutoConfiguration,\
+org.apache.camel.component.aws.ec2.springboot.EC2ComponentConverter
+
diff --git a/components-starter/camel-aws-ecs-starter/src/main/java/org/apache/camel/component/aws/ecs/springboot/ECSComponentAutoConfiguration.java b/components-starter/camel-aws-ecs-starter/src/main/java/org/apache/camel/component/aws/ecs/springboot/ECSComponentAutoConfiguration.java
index 91e6347..259b140 100644
--- a/components-starter/camel-aws-ecs-starter/src/main/java/org/apache/camel/component/aws/ecs/springboot/ECSComponentAutoConfiguration.java
+++ b/components-starter/camel-aws-ecs-starter/src/main/java/org/apache/camel/component/aws/ecs/springboot/ECSComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,ECSComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws-ecs"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, ECSComponentConverter.class})
public class ECSComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class ECSComponentAutoConfiguration {
public ECSComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new ECSComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-aws-ecs-starter/src/main/java/org/apache/camel/component/aws/ecs/springboot/ECSComponentConverter.java b/components-starter/camel-aws-ecs-starter/src/main/java/org/apache/camel/component/aws/ecs/springboot/ECSComponentConverter.java
index 5b4b28a..bf7ccae 100644
--- a/components-starter/camel-aws-ecs-starter/src/main/java/org/apache/camel/component/aws/ecs/springboot/ECSComponentConverter.java
+++ b/components-starter/camel-aws-ecs-starter/src/main/java/org/apache/camel/component/aws/ecs/springboot/ECSComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.aws.ecs.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class ECSComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class ECSComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public ECSComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -57,8 +59,8 @@ public class ECSComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "org.apache.camel.component.aws.ecs.ECSConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.aws.ecs.ECSConfiguration.class);
- case "com.amazonaws.services.ecs.AmazonECS": return camelContext.getRegistry().lookupByNameAndType(ref, com.amazonaws.services.ecs.AmazonECS.class);
+ case "org.apache.camel.component.aws.ecs.ECSConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.aws.ecs.ECSConfiguration.class);
+ case "com.amazonaws.services.ecs.AmazonECS": return applicationContext.getBean(ref, com.amazonaws.services.ecs.AmazonECS.class);
}
return null;
}
diff --git a/components-starter/camel-aws-ecs-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-aws-ecs-starter/src/main/resources/META-INF/spring.factories
index 125cb0c..2b1136d 100644
--- a/components-starter/camel-aws-ecs-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-aws-ecs-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.aws.ecs.springboot.ECSComponentAutoConfiguration
+org.apache.camel.component.aws.ecs.springboot.ECSComponentAutoConfiguration,\
+org.apache.camel.component.aws.ecs.springboot.ECSComponentConverter
+
diff --git a/components-starter/camel-aws-eks-starter/src/main/java/org/apache/camel/component/aws/eks/springboot/EKSComponentAutoConfiguration.java b/components-starter/camel-aws-eks-starter/src/main/java/org/apache/camel/component/aws/eks/springboot/EKSComponentAutoConfiguration.java
index 0bae4a5..2c8f4dc 100644
--- a/components-starter/camel-aws-eks-starter/src/main/java/org/apache/camel/component/aws/eks/springboot/EKSComponentAutoConfiguration.java
+++ b/components-starter/camel-aws-eks-starter/src/main/java/org/apache/camel/component/aws/eks/springboot/EKSComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,EKSComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws-eks"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, EKSComponentConverter.class})
public class EKSComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class EKSComponentAutoConfiguration {
public EKSComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new EKSComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-aws-eks-starter/src/main/java/org/apache/camel/component/aws/eks/springboot/EKSComponentConverter.java b/components-starter/camel-aws-eks-starter/src/main/java/org/apache/camel/component/aws/eks/springboot/EKSComponentConverter.java
index 4ab22d2..371dc29 100644
--- a/components-starter/camel-aws-eks-starter/src/main/java/org/apache/camel/component/aws/eks/springboot/EKSComponentConverter.java
+++ b/components-starter/camel-aws-eks-starter/src/main/java/org/apache/camel/component/aws/eks/springboot/EKSComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.aws.eks.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class EKSComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class EKSComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public EKSComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -57,8 +59,8 @@ public class EKSComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "org.apache.camel.component.aws.eks.EKSConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.aws.eks.EKSConfiguration.class);
- case "com.amazonaws.services.eks.AmazonEKS": return camelContext.getRegistry().lookupByNameAndType(ref, com.amazonaws.services.eks.AmazonEKS.class);
+ case "org.apache.camel.component.aws.eks.EKSConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.aws.eks.EKSConfiguration.class);
+ case "com.amazonaws.services.eks.AmazonEKS": return applicationContext.getBean(ref, com.amazonaws.services.eks.AmazonEKS.class);
}
return null;
}
diff --git a/components-starter/camel-aws-eks-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-aws-eks-starter/src/main/resources/META-INF/spring.factories
index 91ba60a..c43b44f 100644
--- a/components-starter/camel-aws-eks-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-aws-eks-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.aws.eks.springboot.EKSComponentAutoConfiguration
+org.apache.camel.component.aws.eks.springboot.EKSComponentAutoConfiguration,\
+org.apache.camel.component.aws.eks.springboot.EKSComponentConverter
+
diff --git a/components-starter/camel-aws-iam-starter/src/main/java/org/apache/camel/component/aws/iam/springboot/IAMComponentAutoConfiguration.java b/components-starter/camel-aws-iam-starter/src/main/java/org/apache/camel/component/aws/iam/springboot/IAMComponentAutoConfiguration.java
index 0bdf80c..b56f6b2 100644
--- a/components-starter/camel-aws-iam-starter/src/main/java/org/apache/camel/component/aws/iam/springboot/IAMComponentAutoConfiguration.java
+++ b/components-starter/camel-aws-iam-starter/src/main/java/org/apache/camel/component/aws/iam/springboot/IAMComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,IAMComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws-iam"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, IAMComponentConverter.class})
public class IAMComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class IAMComponentAutoConfiguration {
public IAMComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new IAMComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-aws-iam-starter/src/main/java/org/apache/camel/component/aws/iam/springboot/IAMComponentConverter.java b/components-starter/camel-aws-iam-starter/src/main/java/org/apache/camel/component/aws/iam/springboot/IAMComponentConverter.java
index 492fad1..6438b5e 100644
--- a/components-starter/camel-aws-iam-starter/src/main/java/org/apache/camel/component/aws/iam/springboot/IAMComponentConverter.java
+++ b/components-starter/camel-aws-iam-starter/src/main/java/org/apache/camel/component/aws/iam/springboot/IAMComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.aws.iam.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class IAMComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class IAMComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public IAMComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -57,8 +59,8 @@ public class IAMComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "org.apache.camel.component.aws.iam.IAMConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.aws.iam.IAMConfiguration.class);
- case "com.amazonaws.services.identitymanagement.AmazonIdentityManagement": return camelContext.getRegistry().lookupByNameAndType(ref, com.amazonaws.services.identitymanagement.AmazonIdentityManagement.class);
+ case "org.apache.camel.component.aws.iam.IAMConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.aws.iam.IAMConfiguration.class);
+ case "com.amazonaws.services.identitymanagement.AmazonIdentityManagement": return applicationContext.getBean(ref, com.amazonaws.services.identitymanagement.AmazonIdentityManagement.class);
}
return null;
}
diff --git a/components-starter/camel-aws-iam-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-aws-iam-starter/src/main/resources/META-INF/spring.factories
index 387044b..7eff5f5 100644
--- a/components-starter/camel-aws-iam-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-aws-iam-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.aws.iam.springboot.IAMComponentAutoConfiguration
+org.apache.camel.component.aws.iam.springboot.IAMComponentAutoConfiguration,\
+org.apache.camel.component.aws.iam.springboot.IAMComponentConverter
+
diff --git a/components-starter/camel-aws-kinesis-starter/src/main/java/org/apache/camel/component/aws/firehose/springboot/KinesisFirehoseComponentAutoConfiguration.java b/components-starter/camel-aws-kinesis-starter/src/main/java/org/apache/camel/component/aws/firehose/springboot/KinesisFirehoseComponentAutoConfiguration.java
index dd0f1de..d9d9414 100644
--- a/components-starter/camel-aws-kinesis-starter/src/main/java/org/apache/camel/component/aws/firehose/springboot/KinesisFirehoseComponentAutoConfiguration.java
+++ b/components-starter/camel-aws-kinesis-starter/src/main/java/org/apache/camel/component/aws/firehose/springboot/KinesisFirehoseComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,KinesisFirehoseComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws-kinesis-firehose"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, KinesisFirehoseComponentConverter.class})
public class KinesisFirehoseComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class KinesisFirehoseComponentAutoConfiguration {
public KinesisFirehoseComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new KinesisFirehoseComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-aws-kinesis-starter/src/main/java/org/apache/camel/component/aws/firehose/springboot/KinesisFirehoseComponentConverter.java b/components-starter/camel-aws-kinesis-starter/src/main/java/org/apache/camel/component/aws/firehose/springboot/KinesisFirehoseComponentConverter.java
index d3e3e7e..1a4ac56 100644
--- a/components-starter/camel-aws-kinesis-starter/src/main/java/org/apache/camel/component/aws/firehose/springboot/KinesisFirehoseComponentConverter.java
+++ b/components-starter/camel-aws-kinesis-starter/src/main/java/org/apache/camel/component/aws/firehose/springboot/KinesisFirehoseComponentConverter.java
@@ -19,24 +19,25 @@ package org.apache.camel.component.aws.firehose.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class KinesisFirehoseComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class KinesisFirehoseComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public KinesisFirehoseComponentConverter(
- org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -58,8 +59,8 @@ public class KinesisFirehoseComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "com.amazonaws.services.kinesisfirehose.AmazonKinesisFirehose": return camelContext.getRegistry().lookupByNameAndType(ref, com.amazonaws.services.kinesisfirehose.AmazonKinesisFirehose.class);
- case "org.apache.camel.component.aws.firehose.KinesisFirehoseConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.aws.firehose.KinesisFirehoseConfiguration.class);
+ case "com.amazonaws.services.kinesisfirehose.AmazonKinesisFirehose": return applicationContext.getBean(ref, com.amazonaws.services.kinesisfirehose.AmazonKinesisFirehose.class);
+ case "org.apache.camel.component.aws.firehose.KinesisFirehoseConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.aws.firehose.KinesisFirehoseConfiguration.class);
}
return null;
}
diff --git a/components-starter/camel-aws-kinesis-starter/src/main/java/org/apache/camel/component/aws/kinesis/springboot/KinesisComponentAutoConfiguration.java b/components-starter/camel-aws-kinesis-starter/src/main/java/org/apache/camel/component/aws/kinesis/springboot/KinesisComponentAutoConfiguration.java
index 5fae020..977577b 100644
--- a/components-starter/camel-aws-kinesis-starter/src/main/java/org/apache/camel/component/aws/kinesis/springboot/KinesisComponentAutoConfiguration.java
+++ b/components-starter/camel-aws-kinesis-starter/src/main/java/org/apache/camel/component/aws/kinesis/springboot/KinesisComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,KinesisComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws-kinesis"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, KinesisComponentConverter.class})
public class KinesisComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class KinesisComponentAutoConfiguration {
public KinesisComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new KinesisComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-aws-kinesis-starter/src/main/java/org/apache/camel/component/aws/kinesis/springboot/KinesisComponentConverter.java b/components-starter/camel-aws-kinesis-starter/src/main/java/org/apache/camel/component/aws/kinesis/springboot/KinesisComponentConverter.java
index a3a9b66..19af190 100644
--- a/components-starter/camel-aws-kinesis-starter/src/main/java/org/apache/camel/component/aws/kinesis/springboot/KinesisComponentConverter.java
+++ b/components-starter/camel-aws-kinesis-starter/src/main/java/org/apache/camel/component/aws/kinesis/springboot/KinesisComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.aws.kinesis.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class KinesisComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class KinesisComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public KinesisComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -57,8 +59,8 @@ public class KinesisComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "com.amazonaws.services.kinesis.AmazonKinesis": return camelContext.getRegistry().lookupByNameAndType(ref, com.amazonaws.services.kinesis.AmazonKinesis.class);
- case "org.apache.camel.component.aws.kinesis.KinesisConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.aws.kinesis.KinesisConfiguration.class);
+ case "com.amazonaws.services.kinesis.AmazonKinesis": return applicationContext.getBean(ref, com.amazonaws.services.kinesis.AmazonKinesis.class);
+ case "org.apache.camel.component.aws.kinesis.KinesisConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.aws.kinesis.KinesisConfiguration.class);
}
return null;
}
diff --git a/components-starter/camel-aws-kinesis-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-aws-kinesis-starter/src/main/resources/META-INF/spring.factories
index bd1a4ea..82516a5 100644
--- a/components-starter/camel-aws-kinesis-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-aws-kinesis-starter/src/main/resources/META-INF/spring.factories
@@ -17,5 +17,9 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
org.apache.camel.component.aws.kinesis.springboot.KinesisComponentAutoConfiguration,\
-org.apache.camel.component.aws.firehose.springboot.KinesisFirehoseComponentAutoConfiguration
+org.apache.camel.component.aws.firehose.springboot.KinesisFirehoseComponentAutoConfiguration,\
+org.apache.camel.component.aws.kinesis.springboot.KinesisComponentConverter,\
+org.apache.camel.component.aws.firehose.springboot.KinesisFirehoseComponentConverter
+
+
diff --git a/components-starter/camel-aws-kms-starter/src/main/java/org/apache/camel/component/aws/kms/springboot/KMSComponentAutoConfiguration.java b/components-starter/camel-aws-kms-starter/src/main/java/org/apache/camel/component/aws/kms/springboot/KMSComponentAutoConfiguration.java
index 0679d1f..fca3c9c 100644
--- a/components-starter/camel-aws-kms-starter/src/main/java/org/apache/camel/component/aws/kms/springboot/KMSComponentAutoConfiguration.java
+++ b/components-starter/camel-aws-kms-starter/src/main/java/org/apache/camel/component/aws/kms/springboot/KMSComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,KMSComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws-kms"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, KMSComponentConverter.class})
public class KMSComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class KMSComponentAutoConfiguration {
public KMSComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new KMSComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-aws-kms-starter/src/main/java/org/apache/camel/component/aws/kms/springboot/KMSComponentConverter.java b/components-starter/camel-aws-kms-starter/src/main/java/org/apache/camel/component/aws/kms/springboot/KMSComponentConverter.java
index 146b1be..ee4082d 100644
--- a/components-starter/camel-aws-kms-starter/src/main/java/org/apache/camel/component/aws/kms/springboot/KMSComponentConverter.java
+++ b/components-starter/camel-aws-kms-starter/src/main/java/org/apache/camel/component/aws/kms/springboot/KMSComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.aws.kms.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class KMSComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class KMSComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public KMSComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -57,8 +59,8 @@ public class KMSComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "org.apache.camel.component.aws.kms.KMSConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.aws.kms.KMSConfiguration.class);
- case "com.amazonaws.services.kms.AWSKMS": return camelContext.getRegistry().lookupByNameAndType(ref, com.amazonaws.services.kms.AWSKMS.class);
+ case "org.apache.camel.component.aws.kms.KMSConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.aws.kms.KMSConfiguration.class);
+ case "com.amazonaws.services.kms.AWSKMS": return applicationContext.getBean(ref, com.amazonaws.services.kms.AWSKMS.class);
}
return null;
}
diff --git a/components-starter/camel-aws-kms-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-aws-kms-starter/src/main/resources/META-INF/spring.factories
index 50e00d4..5042c8c 100644
--- a/components-starter/camel-aws-kms-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-aws-kms-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.aws.kms.springboot.KMSComponentAutoConfiguration
+org.apache.camel.component.aws.kms.springboot.KMSComponentAutoConfiguration,\
+org.apache.camel.component.aws.kms.springboot.KMSComponentConverter
+
diff --git a/components-starter/camel-aws-lambda-starter/src/main/java/org/apache/camel/component/aws/lambda/springboot/LambdaComponentAutoConfiguration.java b/components-starter/camel-aws-lambda-starter/src/main/java/org/apache/camel/component/aws/lambda/springboot/LambdaComponentAutoConfiguration.java
index 1171ced..bab48a9 100644
--- a/components-starter/camel-aws-lambda-starter/src/main/java/org/apache/camel/component/aws/lambda/springboot/LambdaComponentAutoConfiguration.java
+++ b/components-starter/camel-aws-lambda-starter/src/main/java/org/apache/camel/component/aws/lambda/springboot/LambdaComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,LambdaComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws-lambda"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, LambdaComponentConverter.class})
public class LambdaComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class LambdaComponentAutoConfiguration {
public LambdaComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new LambdaComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-aws-lambda-starter/src/main/java/org/apache/camel/component/aws/lambda/springboot/LambdaComponentConverter.java b/components-starter/camel-aws-lambda-starter/src/main/java/org/apache/camel/component/aws/lambda/springboot/LambdaComponentConverter.java
index 89176b5..a080c21 100644
--- a/components-starter/camel-aws-lambda-starter/src/main/java/org/apache/camel/component/aws/lambda/springboot/LambdaComponentConverter.java
+++ b/components-starter/camel-aws-lambda-starter/src/main/java/org/apache/camel/component/aws/lambda/springboot/LambdaComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.aws.lambda.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class LambdaComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class LambdaComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public LambdaComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -57,8 +59,8 @@ public class LambdaComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "org.apache.camel.component.aws.lambda.LambdaConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.aws.lambda.LambdaConfiguration.class);
- case "com.amazonaws.services.lambda.AWSLambda": return camelContext.getRegistry().lookupByNameAndType(ref, com.amazonaws.services.lambda.AWSLambda.class);
+ case "org.apache.camel.component.aws.lambda.LambdaConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.aws.lambda.LambdaConfiguration.class);
+ case "com.amazonaws.services.lambda.AWSLambda": return applicationContext.getBean(ref, com.amazonaws.services.lambda.AWSLambda.class);
}
return null;
}
diff --git a/components-starter/camel-aws-lambda-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-aws-lambda-starter/src/main/resources/META-INF/spring.factories
index 8165bea..d278cd7 100644
--- a/components-starter/camel-aws-lambda-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-aws-lambda-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.aws.lambda.springboot.LambdaComponentAutoConfiguration
+org.apache.camel.component.aws.lambda.springboot.LambdaComponentAutoConfiguration,\
+org.apache.camel.component.aws.lambda.springboot.LambdaComponentConverter
+
diff --git a/components-starter/camel-aws-mq-starter/src/main/java/org/apache/camel/component/aws/mq/springboot/MQComponentAutoConfiguration.java b/components-starter/camel-aws-mq-starter/src/main/java/org/apache/camel/component/aws/mq/springboot/MQComponentAutoConfiguration.java
index b36b7cb..cc39aed 100644
--- a/components-starter/camel-aws-mq-starter/src/main/java/org/apache/camel/component/aws/mq/springboot/MQComponentAutoConfiguration.java
+++ b/components-starter/camel-aws-mq-starter/src/main/java/org/apache/camel/component/aws/mq/springboot/MQComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,MQComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws-mq"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, MQComponentConverter.class})
public class MQComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class MQComponentAutoConfiguration {
public MQComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new MQComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-aws-mq-starter/src/main/java/org/apache/camel/component/aws/mq/springboot/MQComponentConverter.java b/components-starter/camel-aws-mq-starter/src/main/java/org/apache/camel/component/aws/mq/springboot/MQComponentConverter.java
index e2bac1d..fb20c6f 100644
--- a/components-starter/camel-aws-mq-starter/src/main/java/org/apache/camel/component/aws/mq/springboot/MQComponentConverter.java
+++ b/components-starter/camel-aws-mq-starter/src/main/java/org/apache/camel/component/aws/mq/springboot/MQComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.aws.mq.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class MQComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class MQComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public MQComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -57,8 +59,8 @@ public class MQComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "com.amazonaws.services.mq.AmazonMQ": return camelContext.getRegistry().lookupByNameAndType(ref, com.amazonaws.services.mq.AmazonMQ.class);
- case "org.apache.camel.component.aws.mq.MQConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.aws.mq.MQConfiguration.class);
+ case "com.amazonaws.services.mq.AmazonMQ": return applicationContext.getBean(ref, com.amazonaws.services.mq.AmazonMQ.class);
+ case "org.apache.camel.component.aws.mq.MQConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.aws.mq.MQConfiguration.class);
}
return null;
}
diff --git a/components-starter/camel-aws-mq-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-aws-mq-starter/src/main/resources/META-INF/spring.factories
index f2c8c77..c601670 100644
--- a/components-starter/camel-aws-mq-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-aws-mq-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.aws.mq.springboot.MQComponentAutoConfiguration
+org.apache.camel.component.aws.mq.springboot.MQComponentAutoConfiguration,\
+org.apache.camel.component.aws.mq.springboot.MQComponentConverter
+
diff --git a/components-starter/camel-aws-msk-starter/src/main/java/org/apache/camel/component/aws/msk/springboot/MSKComponentAutoConfiguration.java b/components-starter/camel-aws-msk-starter/src/main/java/org/apache/camel/component/aws/msk/springboot/MSKComponentAutoConfiguration.java
index 273040d..d602bff 100644
--- a/components-starter/camel-aws-msk-starter/src/main/java/org/apache/camel/component/aws/msk/springboot/MSKComponentAutoConfiguration.java
+++ b/components-starter/camel-aws-msk-starter/src/main/java/org/apache/camel/component/aws/msk/springboot/MSKComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,MSKComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws-msk"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, MSKComponentConverter.class})
public class MSKComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class MSKComponentAutoConfiguration {
public MSKComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new MSKComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-aws-msk-starter/src/main/java/org/apache/camel/component/aws/msk/springboot/MSKComponentConverter.java b/components-starter/camel-aws-msk-starter/src/main/java/org/apache/camel/component/aws/msk/springboot/MSKComponentConverter.java
index 56fcc78..45d7568 100644
--- a/components-starter/camel-aws-msk-starter/src/main/java/org/apache/camel/component/aws/msk/springboot/MSKComponentConverter.java
+++ b/components-starter/camel-aws-msk-starter/src/main/java/org/apache/camel/component/aws/msk/springboot/MSKComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.aws.msk.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class MSKComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class MSKComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public MSKComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -57,8 +59,8 @@ public class MSKComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "org.apache.camel.component.aws.msk.MSKConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.aws.msk.MSKConfiguration.class);
- case "com.amazonaws.services.kafka.AWSKafka": return camelContext.getRegistry().lookupByNameAndType(ref, com.amazonaws.services.kafka.AWSKafka.class);
+ case "org.apache.camel.component.aws.msk.MSKConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.aws.msk.MSKConfiguration.class);
+ case "com.amazonaws.services.kafka.AWSKafka": return applicationContext.getBean(ref, com.amazonaws.services.kafka.AWSKafka.class);
}
return null;
}
diff --git a/components-starter/camel-aws-msk-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-aws-msk-starter/src/main/resources/META-INF/spring.factories
index 15f7aa4..20bf4fc 100644
--- a/components-starter/camel-aws-msk-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-aws-msk-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.aws.msk.springboot.MSKComponentAutoConfiguration
+org.apache.camel.component.aws.msk.springboot.MSKComponentAutoConfiguration,\
+org.apache.camel.component.aws.msk.springboot.MSKComponentConverter
+
diff --git a/components-starter/camel-aws-s3-starter/src/main/java/org/apache/camel/component/aws/s3/springboot/S3ComponentAutoConfiguration.java b/components-starter/camel-aws-s3-starter/src/main/java/org/apache/camel/component/aws/s3/springboot/S3ComponentAutoConfiguration.java
index 0070a29..10c221c 100644
--- a/components-starter/camel-aws-s3-starter/src/main/java/org/apache/camel/component/aws/s3/springboot/S3ComponentAutoConfiguration.java
+++ b/components-starter/camel-aws-s3-starter/src/main/java/org/apache/camel/component/aws/s3/springboot/S3ComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,S3ComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws-s3"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, S3ComponentConverter.class})
public class S3ComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class S3ComponentAutoConfiguration {
public S3ComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new S3ComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-aws-s3-starter/src/main/java/org/apache/camel/component/aws/s3/springboot/S3ComponentConverter.java b/components-starter/camel-aws-s3-starter/src/main/java/org/apache/camel/component/aws/s3/springboot/S3ComponentConverter.java
index d9d06bd..42d1b86 100644
--- a/components-starter/camel-aws-s3-starter/src/main/java/org/apache/camel/component/aws/s3/springboot/S3ComponentConverter.java
+++ b/components-starter/camel-aws-s3-starter/src/main/java/org/apache/camel/component/aws/s3/springboot/S3ComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.aws.s3.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class S3ComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class S3ComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public S3ComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -59,10 +61,10 @@ public class S3ComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "com.amazonaws.services.s3.AmazonS3": return camelContext.getRegistry().lookupByNameAndType(ref, com.amazonaws.services.s3.AmazonS3.class);
- case "org.apache.camel.component.aws.s3.S3Configuration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.aws.s3.S3Configuration.class);
- case "com.amazonaws.client.builder.AwsClientBuilder.EndpointConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, com.amazonaws.client.builder.AwsClientBuilder.EndpointConfiguration.class);
- case "com.amazonaws.services.s3.model.EncryptionMaterials": return camelContext.getRegistry().lookupByNameAndType(ref, com.amazonaws.services.s3.model.EncryptionMaterials.class);
+ case "com.amazonaws.services.s3.AmazonS3": return applicationContext.getBean(ref, com.amazonaws.services.s3.AmazonS3.class);
+ case "org.apache.camel.component.aws.s3.S3Configuration": return applicationContext.getBean(ref, org.apache.camel.component.aws.s3.S3Configuration.class);
+ case "com.amazonaws.client.builder.AwsClientBuilder.EndpointConfiguration": return applicationContext.getBean(ref, com.amazonaws.client.builder.AwsClientBuilder.EndpointConfiguration.class);
+ case "com.amazonaws.services.s3.model.EncryptionMaterials": return applicationContext.getBean(ref, com.amazonaws.services.s3.model.EncryptionMaterials.class);
}
return null;
}
diff --git a/components-starter/camel-aws-s3-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-aws-s3-starter/src/main/resources/META-INF/spring.factories
index 276dfc3..3b88141 100644
--- a/components-starter/camel-aws-s3-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-aws-s3-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.aws.s3.springboot.S3ComponentAutoConfiguration
+org.apache.camel.component.aws.s3.springboot.S3ComponentAutoConfiguration,\
+org.apache.camel.component.aws.s3.springboot.S3ComponentConverter
+
diff --git a/components-starter/camel-aws-sdb-starter/src/main/java/org/apache/camel/component/aws/sdb/springboot/SdbComponentAutoConfiguration.java b/components-starter/camel-aws-sdb-starter/src/main/java/org/apache/camel/component/aws/sdb/springboot/SdbComponentAutoConfiguration.java
index 61b2de6..b04e6bb 100644
--- a/components-starter/camel-aws-sdb-starter/src/main/java/org/apache/camel/component/aws/sdb/springboot/SdbComponentAutoConfiguration.java
+++ b/components-starter/camel-aws-sdb-starter/src/main/java/org/apache/camel/component/aws/sdb/springboot/SdbComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,SdbComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws-sdb"})
+@AutoConfigureAfter(CamelAutoConfiguration.class)
public class SdbComponentAutoConfiguration {
@Autowired
diff --git a/components-starter/camel-aws-ses-starter/src/main/java/org/apache/camel/component/aws/ses/springboot/SesComponentAutoConfiguration.java b/components-starter/camel-aws-ses-starter/src/main/java/org/apache/camel/component/aws/ses/springboot/SesComponentAutoConfiguration.java
index 26b3e43..f1edcf1 100644
--- a/components-starter/camel-aws-ses-starter/src/main/java/org/apache/camel/component/aws/ses/springboot/SesComponentAutoConfiguration.java
+++ b/components-starter/camel-aws-ses-starter/src/main/java/org/apache/camel/component/aws/ses/springboot/SesComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,SesComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws-ses"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, SesComponentConverter.class})
public class SesComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class SesComponentAutoConfiguration {
public SesComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new SesComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-aws-ses-starter/src/main/java/org/apache/camel/component/aws/ses/springboot/SesComponentConverter.java b/components-starter/camel-aws-ses-starter/src/main/java/org/apache/camel/component/aws/ses/springboot/SesComponentConverter.java
index 621e5c5..c975c95 100644
--- a/components-starter/camel-aws-ses-starter/src/main/java/org/apache/camel/component/aws/ses/springboot/SesComponentConverter.java
+++ b/components-starter/camel-aws-ses-starter/src/main/java/org/apache/camel/component/aws/ses/springboot/SesComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.aws.ses.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class SesComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class SesComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public SesComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -57,8 +59,8 @@ public class SesComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "com.amazonaws.services.simpleemail.AmazonSimpleEmailService": return camelContext.getRegistry().lookupByNameAndType(ref, com.amazonaws.services.simpleemail.AmazonSimpleEmailService.class);
- case "org.apache.camel.component.aws.ses.SesConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.aws.ses.SesConfiguration.class);
+ case "com.amazonaws.services.simpleemail.AmazonSimpleEmailService": return applicationContext.getBean(ref, com.amazonaws.services.simpleemail.AmazonSimpleEmailService.class);
+ case "org.apache.camel.component.aws.ses.SesConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.aws.ses.SesConfiguration.class);
}
return null;
}
diff --git a/components-starter/camel-aws-ses-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-aws-ses-starter/src/main/resources/META-INF/spring.factories
index bfb0dd7..92d0da5 100644
--- a/components-starter/camel-aws-ses-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-aws-ses-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.aws.ses.springboot.SesComponentAutoConfiguration
+org.apache.camel.component.aws.ses.springboot.SesComponentAutoConfiguration,\
+org.apache.camel.component.aws.ses.springboot.SesComponentConverter
+
diff --git a/components-starter/camel-aws-sns-starter/src/main/java/org/apache/camel/component/aws/sns/springboot/SnsComponentAutoConfiguration.java b/components-starter/camel-aws-sns-starter/src/main/java/org/apache/camel/component/aws/sns/springboot/SnsComponentAutoConfiguration.java
index a02ebf1..73ca54c 100644
--- a/components-starter/camel-aws-sns-starter/src/main/java/org/apache/camel/component/aws/sns/springboot/SnsComponentAutoConfiguration.java
+++ b/components-starter/camel-aws-sns-starter/src/main/java/org/apache/camel/component/aws/sns/springboot/SnsComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,SnsComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws-sns"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, SnsComponentConverter.class})
public class SnsComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class SnsComponentAutoConfiguration {
public SnsComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new SnsComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-aws-sns-starter/src/main/java/org/apache/camel/component/aws/sns/springboot/SnsComponentConverter.java b/components-starter/camel-aws-sns-starter/src/main/java/org/apache/camel/component/aws/sns/springboot/SnsComponentConverter.java
index e801d1e..06e9607 100644
--- a/components-starter/camel-aws-sns-starter/src/main/java/org/apache/camel/component/aws/sns/springboot/SnsComponentConverter.java
+++ b/components-starter/camel-aws-sns-starter/src/main/java/org/apache/camel/component/aws/sns/springboot/SnsComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.aws.sns.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class SnsComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class SnsComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public SnsComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -58,9 +60,9 @@ public class SnsComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "com.amazonaws.services.sns.AmazonSNS": return camelContext.getRegistry().lookupByNameAndType(ref, com.amazonaws.services.sns.AmazonSNS.class);
- case "com.amazonaws.services.sqs.AmazonSQS": return camelContext.getRegistry().lookupByNameAndType(ref, com.amazonaws.services.sqs.AmazonSQS.class);
- case "org.apache.camel.component.aws.sns.SnsConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.aws.sns.SnsConfiguration.class);
+ case "com.amazonaws.services.sns.AmazonSNS": return applicationContext.getBean(ref, com.amazonaws.services.sns.AmazonSNS.class);
+ case "com.amazonaws.services.sqs.AmazonSQS": return applicationContext.getBean(ref, com.amazonaws.services.sqs.AmazonSQS.class);
+ case "org.apache.camel.component.aws.sns.SnsConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.aws.sns.SnsConfiguration.class);
}
return null;
}
diff --git a/components-starter/camel-aws-sns-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-aws-sns-starter/src/main/resources/META-INF/spring.factories
index 7114bd9..5e884fa 100644
--- a/components-starter/camel-aws-sns-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-aws-sns-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.aws.sns.springboot.SnsComponentAutoConfiguration
+org.apache.camel.component.aws.sns.springboot.SnsComponentAutoConfiguration,\
+org.apache.camel.component.aws.sns.springboot.SnsComponentConverter
+
diff --git a/components-starter/camel-aws-sqs-starter/src/main/java/org/apache/camel/component/aws/sqs/springboot/SqsComponentAutoConfiguration.java b/components-starter/camel-aws-sqs-starter/src/main/java/org/apache/camel/component/aws/sqs/springboot/SqsComponentAutoConfiguration.java
index 8ac2546..9af2e21 100644
--- a/components-starter/camel-aws-sqs-starter/src/main/java/org/apache/camel/component/aws/sqs/springboot/SqsComponentAutoConfiguration.java
+++ b/components-starter/camel-aws-sqs-starter/src/main/java/org/apache/camel/component/aws/sqs/springboot/SqsComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,SqsComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws-sqs"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, SqsComponentConverter.class})
public class SqsComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class SqsComponentAutoConfiguration {
public SqsComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new SqsComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-aws-sqs-starter/src/main/java/org/apache/camel/component/aws/sqs/springboot/SqsComponentConverter.java b/components-starter/camel-aws-sqs-starter/src/main/java/org/apache/camel/component/aws/sqs/springboot/SqsComponentConverter.java
index 3da9479..3242233 100644
--- a/components-starter/camel-aws-sqs-starter/src/main/java/org/apache/camel/component/aws/sqs/springboot/SqsComponentConverter.java
+++ b/components-starter/camel-aws-sqs-starter/src/main/java/org/apache/camel/component/aws/sqs/springboot/SqsComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.aws.sqs.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class SqsComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class SqsComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public SqsComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -57,8 +59,8 @@ public class SqsComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "com.amazonaws.services.sqs.AmazonSQS": return camelContext.getRegistry().lookupByNameAndType(ref, com.amazonaws.services.sqs.AmazonSQS.class);
- case "org.apache.camel.component.aws.sqs.SqsConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.aws.sqs.SqsConfiguration.class);
+ case "com.amazonaws.services.sqs.AmazonSQS": return applicationContext.getBean(ref, com.amazonaws.services.sqs.AmazonSQS.class);
+ case "org.apache.camel.component.aws.sqs.SqsConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.aws.sqs.SqsConfiguration.class);
}
return null;
}
diff --git a/components-starter/camel-aws-sqs-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-aws-sqs-starter/src/main/resources/META-INF/spring.factories
index 3b870f1..c6ad9bd3 100644
--- a/components-starter/camel-aws-sqs-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-aws-sqs-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.aws.sqs.springboot.SqsComponentAutoConfiguration
+org.apache.camel.component.aws.sqs.springboot.SqsComponentAutoConfiguration,\
+org.apache.camel.component.aws.sqs.springboot.SqsComponentConverter
+
diff --git a/components-starter/camel-aws-swf-starter/src/main/java/org/apache/camel/component/aws/swf/springboot/SWFComponentAutoConfiguration.java b/components-starter/camel-aws-swf-starter/src/main/java/org/apache/camel/component/aws/swf/springboot/SWFComponentAutoConfiguration.java
index f06a71c..c4d5eca 100644
--- a/components-starter/camel-aws-swf-starter/src/main/java/org/apache/camel/component/aws/swf/springboot/SWFComponentAutoConfiguration.java
+++ b/components-starter/camel-aws-swf-starter/src/main/java/org/apache/camel/component/aws/swf/springboot/SWFComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,SWFComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws-swf"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, SWFComponentConverter.class})
public class SWFComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class SWFComponentAutoConfiguration {
public SWFComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new SWFComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-aws-swf-starter/src/main/java/org/apache/camel/component/aws/swf/springboot/SWFComponentConverter.java b/components-starter/camel-aws-swf-starter/src/main/java/org/apache/camel/component/aws/swf/springboot/SWFComponentConverter.java
index bcc66e2..8a557ee 100644
--- a/components-starter/camel-aws-swf-starter/src/main/java/org/apache/camel/component/aws/swf/springboot/SWFComponentConverter.java
+++ b/components-starter/camel-aws-swf-starter/src/main/java/org/apache/camel/component/aws/swf/springboot/SWFComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.aws.swf.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class SWFComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class SWFComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public SWFComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -62,13 +64,13 @@ public class SWFComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "com.amazonaws.services.simpleworkflow.AmazonSimpleWorkflow": return camelContext.getRegistry().lookupByNameAndType(ref, com.amazonaws.services.simpleworkflow.AmazonSimpleWorkflow.class);
- case "org.apache.camel.component.aws.swf.SWFConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.aws.swf.SWFConfiguration.class);
- case "com.amazonaws.services.simpleworkflow.flow.DataConverter": return camelContext.getRegistry().lookupByNameAndType(ref, com.amazonaws.services.simpleworkflow.flow.DataConverter.class);
- case "com.amazonaws.services.simpleworkflow.flow.ActivitySchedulingOptions": return camelContext.getRegistry().lookupByNameAndType(ref, com.amazonaws.services.simpleworkflow.flow.ActivitySchedulingOptions.class);
- case "com.amazonaws.services.simpleworkflow.flow.worker.ActivityTypeExecutionOptions": return camelContext.getRegistry().lookupByNameAndType(ref, com.amazonaws.services.simpleworkflow.flow.worker.ActivityTypeExecutionOptions.class);
- case "com.amazonaws.services.simpleworkflow.flow.worker.ActivityTypeRegistrationOptions": return camelContext.getRegistry().lookupByNameAndType(ref, com.amazonaws.services.simpleworkflow.flow.worker.ActivityTypeRegistrationOptions.class);
- case "com.amazonaws.services.simpleworkflow.flow.WorkflowTypeRegistrationOptions": return camelContext.getRegistry().lookupByNameAndType(ref, com.amazonaws.services.simpleworkflow.flow.WorkflowTypeRegistrationOptions.class);
+ case "com.amazonaws.services.simpleworkflow.AmazonSimpleWorkflow": return applicationContext.getBean(ref, com.amazonaws.services.simpleworkflow.AmazonSimpleWorkflow.class);
+ case "org.apache.camel.component.aws.swf.SWFConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.aws.swf.SWFConfiguration.class);
+ case "com.amazonaws.services.simpleworkflow.flow.DataConverter": return applicationContext.getBean(ref, com.amazonaws.services.simpleworkflow.flow.DataConverter.class);
+ case "com.amazonaws.services.simpleworkflow.flow.ActivitySchedulingOptions": return applicationContext.getBean(ref, com.amazonaws.services.simpleworkflow.flow.ActivitySchedulingOptions.class);
+ case "com.amazonaws.services.simpleworkflow.flow.worker.ActivityTypeExecutionOptions": return applicationContext.getBean(ref, com.amazonaws.services.simpleworkflow.flow.worker.ActivityTypeExecutionOptions.class);
+ case "com.amazonaws.services.simpleworkflow.flow.worker.ActivityTypeRegistrationOptions": return applicationContext.getBean(ref, com.amazonaws.services.simpleworkflow.flow.worker.ActivityTypeRegistrationOptions.class);
+ case "com.amazonaws.services.simpleworkflow.flow.WorkflowTypeRegistrationOptions": return applicationContext.getBean(ref, com.amazonaws.services.simpleworkflow.flow.WorkflowTypeRegistrationOptions.class);
}
return null;
}
diff --git a/components-starter/camel-aws-swf-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-aws-swf-starter/src/main/resources/META-INF/spring.factories
index e1cfa39..8557deb 100644
--- a/components-starter/camel-aws-swf-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-aws-swf-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.aws.swf.springboot.SWFComponentAutoConfiguration
+org.apache.camel.component.aws.swf.springboot.SWFComponentAutoConfiguration,\
+org.apache.camel.component.aws.swf.springboot.SWFComponentConverter
+
diff --git a/components-starter/camel-aws-translate-starter/src/main/java/org/apache/camel/component/aws/translate/springboot/TranslateComponentAutoConfiguration.java b/components-starter/camel-aws-translate-starter/src/main/java/org/apache/camel/component/aws/translate/springboot/TranslateComponentAutoConfiguration.java
index 820baff..bef4c35 100644
--- a/components-starter/camel-aws-translate-starter/src/main/java/org/apache/camel/component/aws/translate/springboot/TranslateComponentAutoConfiguration.java
+++ b/components-starter/camel-aws-translate-starter/src/main/java/org/apache/camel/component/aws/translate/springboot/TranslateComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,TranslateComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws-translate"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, TranslateComponentConverter.class})
public class TranslateComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class TranslateComponentAutoConfiguration {
public TranslateComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new TranslateComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-aws-translate-starter/src/main/java/org/apache/camel/component/aws/translate/springboot/TranslateComponentConverter.java b/components-starter/camel-aws-translate-starter/src/main/java/org/apache/camel/component/aws/translate/springboot/TranslateComponentConverter.java
index 5bab67c..a0bffdb 100644
--- a/components-starter/camel-aws-translate-starter/src/main/java/org/apache/camel/component/aws/translate/springboot/TranslateComponentConverter.java
+++ b/components-starter/camel-aws-translate-starter/src/main/java/org/apache/camel/component/aws/translate/springboot/TranslateComponentConverter.java
@@ -19,24 +19,25 @@ package org.apache.camel.component.aws.translate.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class TranslateComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class TranslateComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public TranslateComponentConverter(
- org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -58,8 +59,8 @@ public class TranslateComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "org.apache.camel.component.aws.translate.TranslateConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.aws.translate.TranslateConfiguration.class);
- case "com.amazonaws.services.translate.AmazonTranslate": return camelContext.getRegistry().lookupByNameAndType(ref, com.amazonaws.services.translate.AmazonTranslate.class);
+ case "org.apache.camel.component.aws.translate.TranslateConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.aws.translate.TranslateConfiguration.class);
+ case "com.amazonaws.services.translate.AmazonTranslate": return applicationContext.getBean(ref, com.amazonaws.services.translate.AmazonTranslate.class);
}
return null;
}
diff --git a/components-starter/camel-aws-translate-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-aws-translate-starter/src/main/resources/META-INF/spring.factories
index 09972e9..ec87db7 100644
--- a/components-starter/camel-aws-translate-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-aws-translate-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.aws.translate.springboot.TranslateComponentAutoConfiguration
+org.apache.camel.component.aws.translate.springboot.TranslateComponentAutoConfiguration,\
+org.apache.camel.component.aws.translate.springboot.TranslateComponentConverter
+
diff --git a/components-starter/camel-aws2-athena-starter/src/main/java/org/apache/camel/component/aws2/athena/springboot/Athena2ComponentAutoConfiguration.java b/components-starter/camel-aws2-athena-starter/src/main/java/org/apache/camel/component/aws2/athena/springboot/Athena2ComponentAutoConfiguration.java
index af8748b..3bab736 100644
--- a/components-starter/camel-aws2-athena-starter/src/main/java/org/apache/camel/component/aws2/athena/springboot/Athena2ComponentAutoConfiguration.java
+++ b/components-starter/camel-aws2-athena-starter/src/main/java/org/apache/camel/component/aws2/athena/springboot/Athena2ComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,Athena2ComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws2-athena"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, Athena2ComponentConverter.class})
public class Athena2ComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class Athena2ComponentAutoConfiguration {
public Athena2ComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new Athena2ComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-aws2-athena-starter/src/main/java/org/apache/camel/component/aws2/athena/springboot/Athena2ComponentConverter.java b/components-starter/camel-aws2-athena-starter/src/main/java/org/apache/camel/component/aws2/athena/springboot/Athena2ComponentConverter.java
index 53bb946..e614c58 100644
--- a/components-starter/camel-aws2-athena-starter/src/main/java/org/apache/camel/component/aws2/athena/springboot/Athena2ComponentConverter.java
+++ b/components-starter/camel-aws2-athena-starter/src/main/java/org/apache/camel/component/aws2/athena/springboot/Athena2ComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.aws2.athena.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class Athena2ComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class Athena2ComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public Athena2ComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -57,8 +59,8 @@ public class Athena2ComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "software.amazon.awssdk.services.athena.AthenaClient": return camelContext.getRegistry().lookupByNameAndType(ref, software.amazon.awssdk.services.athena.AthenaClient.class);
- case "org.apache.camel.component.aws2.athena.Athena2Configuration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.aws2.athena.Athena2Configuration.class);
+ case "software.amazon.awssdk.services.athena.AthenaClient": return applicationContext.getBean(ref, software.amazon.awssdk.services.athena.AthenaClient.class);
+ case "org.apache.camel.component.aws2.athena.Athena2Configuration": return applicationContext.getBean(ref, org.apache.camel.component.aws2.athena.Athena2Configuration.class);
}
return null;
}
diff --git a/components-starter/camel-aws2-athena-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-aws2-athena-starter/src/main/resources/META-INF/spring.factories
index d2ca763..4cf8a95 100644
--- a/components-starter/camel-aws2-athena-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-aws2-athena-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.aws2.athena.springboot.Athena2ComponentAutoConfiguration
+org.apache.camel.component.aws2.athena.springboot.Athena2ComponentAutoConfiguration,\
+org.apache.camel.component.aws2.athena.springboot.Athena2ComponentConverter
+
diff --git a/components-starter/camel-aws2-cw-starter/src/main/java/org/apache/camel/component/aws2/cw/springboot/Cw2ComponentAutoConfiguration.java b/components-starter/camel-aws2-cw-starter/src/main/java/org/apache/camel/component/aws2/cw/springboot/Cw2ComponentAutoConfiguration.java
index 81790fb..bdb25ec 100644
--- a/components-starter/camel-aws2-cw-starter/src/main/java/org/apache/camel/component/aws2/cw/springboot/Cw2ComponentAutoConfiguration.java
+++ b/components-starter/camel-aws2-cw-starter/src/main/java/org/apache/camel/component/aws2/cw/springboot/Cw2ComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,Cw2ComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws2-cw"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, Cw2ComponentConverter.class})
public class Cw2ComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class Cw2ComponentAutoConfiguration {
public Cw2ComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new Cw2ComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-aws2-cw-starter/src/main/java/org/apache/camel/component/aws2/cw/springboot/Cw2ComponentConverter.java b/components-starter/camel-aws2-cw-starter/src/main/java/org/apache/camel/component/aws2/cw/springboot/Cw2ComponentConverter.java
index 04cb434..24a7f2b 100644
--- a/components-starter/camel-aws2-cw-starter/src/main/java/org/apache/camel/component/aws2/cw/springboot/Cw2ComponentConverter.java
+++ b/components-starter/camel-aws2-cw-starter/src/main/java/org/apache/camel/component/aws2/cw/springboot/Cw2ComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.aws2.cw.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class Cw2ComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class Cw2ComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public Cw2ComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -58,9 +60,9 @@ public class Cw2ComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "software.amazon.awssdk.services.cloudwatch.CloudWatchClient": return camelContext.getRegistry().lookupByNameAndType(ref, software.amazon.awssdk.services.cloudwatch.CloudWatchClient.class);
- case "org.apache.camel.component.aws2.cw.Cw2Configuration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.aws2.cw.Cw2Configuration.class);
- case "java.time.Instant": return camelContext.getRegistry().lookupByNameAndType(ref, java.time.Instant.class);
+ case "software.amazon.awssdk.services.cloudwatch.CloudWatchClient": return applicationContext.getBean(ref, software.amazon.awssdk.services.cloudwatch.CloudWatchClient.class);
+ case "org.apache.camel.component.aws2.cw.Cw2Configuration": return applicationContext.getBean(ref, org.apache.camel.component.aws2.cw.Cw2Configuration.class);
+ case "java.time.Instant": return applicationContext.getBean(ref, java.time.Instant.class);
}
return null;
}
diff --git a/components-starter/camel-aws2-cw-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-aws2-cw-starter/src/main/resources/META-INF/spring.factories
index 74b1682..12f0bd5 100644
--- a/components-starter/camel-aws2-cw-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-aws2-cw-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.aws2.cw.springboot.Cw2ComponentAutoConfiguration
+org.apache.camel.component.aws2.cw.springboot.Cw2ComponentAutoConfiguration,\
+org.apache.camel.component.aws2.cw.springboot.Cw2ComponentConverter
+
diff --git a/components-starter/camel-aws2-ddb-starter/src/main/java/org/apache/camel/component/aws2/ddb/springboot/Ddb2ComponentAutoConfiguration.java b/components-starter/camel-aws2-ddb-starter/src/main/java/org/apache/camel/component/aws2/ddb/springboot/Ddb2ComponentAutoConfiguration.java
index f5a7c1e..ff576ea 100644
--- a/components-starter/camel-aws2-ddb-starter/src/main/java/org/apache/camel/component/aws2/ddb/springboot/Ddb2ComponentAutoConfiguration.java
+++ b/components-starter/camel-aws2-ddb-starter/src/main/java/org/apache/camel/component/aws2/ddb/springboot/Ddb2ComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,Ddb2ComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws2-ddb"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, Ddb2ComponentConverter.class})
public class Ddb2ComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class Ddb2ComponentAutoConfiguration {
public Ddb2ComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new Ddb2ComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-aws2-ddb-starter/src/main/java/org/apache/camel/component/aws2/ddb/springboot/Ddb2ComponentConverter.java b/components-starter/camel-aws2-ddb-starter/src/main/java/org/apache/camel/component/aws2/ddb/springboot/Ddb2ComponentConverter.java
index 1a7518a..e645e0c 100644
--- a/components-starter/camel-aws2-ddb-starter/src/main/java/org/apache/camel/component/aws2/ddb/springboot/Ddb2ComponentConverter.java
+++ b/components-starter/camel-aws2-ddb-starter/src/main/java/org/apache/camel/component/aws2/ddb/springboot/Ddb2ComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.aws2.ddb.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class Ddb2ComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class Ddb2ComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public Ddb2ComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -57,8 +59,8 @@ public class Ddb2ComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "software.amazon.awssdk.services.dynamodb.DynamoDbClient": return camelContext.getRegistry().lookupByNameAndType(ref, software.amazon.awssdk.services.dynamodb.DynamoDbClient.class);
- case "org.apache.camel.component.aws2.ddb.Ddb2Configuration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.aws2.ddb.Ddb2Configuration.class);
+ case "software.amazon.awssdk.services.dynamodb.DynamoDbClient": return applicationContext.getBean(ref, software.amazon.awssdk.services.dynamodb.DynamoDbClient.class);
+ case "org.apache.camel.component.aws2.ddb.Ddb2Configuration": return applicationContext.getBean(ref, org.apache.camel.component.aws2.ddb.Ddb2Configuration.class);
}
return null;
}
diff --git a/components-starter/camel-aws2-ddb-starter/src/main/java/org/apache/camel/component/aws2/ddbstream/springboot/Ddb2StreamComponentAutoConfiguration.java b/components-starter/camel-aws2-ddb-starter/src/main/java/org/apache/camel/component/aws2/ddbstream/springboot/Ddb2StreamComponentAutoConfiguration.java
index 2726008..8382f11 100644
--- a/components-starter/camel-aws2-ddb-starter/src/main/java/org/apache/camel/component/aws2/ddbstream/springboot/Ddb2StreamComponentAutoConfiguration.java
+++ b/components-starter/camel-aws2-ddb-starter/src/main/java/org/apache/camel/component/aws2/ddbstream/springboot/Ddb2StreamComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,Ddb2StreamComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws2-ddbstream"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, Ddb2StreamComponentConverter.class})
public class Ddb2StreamComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class Ddb2StreamComponentAutoConfiguration {
public Ddb2StreamComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new Ddb2StreamComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-aws2-ddb-starter/src/main/java/org/apache/camel/component/aws2/ddbstream/springboot/Ddb2StreamComponentConverter.java b/components-starter/camel-aws2-ddb-starter/src/main/java/org/apache/camel/component/aws2/ddbstream/springboot/Ddb2StreamComponentConverter.java
index 56524fb..f09cae9 100644
--- a/components-starter/camel-aws2-ddb-starter/src/main/java/org/apache/camel/component/aws2/ddbstream/springboot/Ddb2StreamComponentConverter.java
+++ b/components-starter/camel-aws2-ddb-starter/src/main/java/org/apache/camel/component/aws2/ddbstream/springboot/Ddb2StreamComponentConverter.java
@@ -19,24 +19,25 @@ package org.apache.camel.component.aws2.ddbstream.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class Ddb2StreamComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class Ddb2StreamComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public Ddb2StreamComponentConverter(
- org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -59,9 +60,9 @@ public class Ddb2StreamComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "software.amazon.awssdk.services.dynamodb.streams.DynamoDbStreamsClient": return camelContext.getRegistry().lookupByNameAndType(ref, software.amazon.awssdk.services.dynamodb.streams.DynamoDbStreamsClient.class);
- case "org.apache.camel.component.aws2.ddbstream.Ddb2StreamConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.aws2.ddbstream.Ddb2StreamConfiguration.class);
- case "org.apache.camel.component.aws2.ddbstream.SequenceNumberProvider": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.aws2.ddbstream.SequenceNumberProvider.class);
+ case "software.amazon.awssdk.services.dynamodb.streams.DynamoDbStreamsClient": return applicationContext.getBean(ref, software.amazon.awssdk.services.dynamodb.streams.DynamoDbStreamsClient.class);
+ case "org.apache.camel.component.aws2.ddbstream.Ddb2StreamConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.aws2.ddbstream.Ddb2StreamConfiguration.class);
+ case "org.apache.camel.component.aws2.ddbstream.SequenceNumberProvider": return applicationContext.getBean(ref, org.apache.camel.component.aws2.ddbstream.SequenceNumberProvider.class);
}
return null;
}
diff --git a/components-starter/camel-aws2-ddb-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-aws2-ddb-starter/src/main/resources/META-INF/spring.factories
index 0341964..8d7571e 100644
--- a/components-starter/camel-aws2-ddb-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-aws2-ddb-starter/src/main/resources/META-INF/spring.factories
@@ -17,5 +17,9 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
org.apache.camel.component.aws2.ddb.springboot.Ddb2ComponentAutoConfiguration,\
-org.apache.camel.component.aws2.ddbstream.springboot.Ddb2StreamComponentAutoConfiguration
+org.apache.camel.component.aws2.ddbstream.springboot.Ddb2StreamComponentAutoConfiguration,\
+org.apache.camel.component.aws2.ddb.springboot.Ddb2ComponentConverter,\
+org.apache.camel.component.aws2.ddbstream.springboot.Ddb2StreamComponentConverter
+
+
diff --git a/components-starter/camel-aws2-ec2-starter/src/main/java/org/apache/camel/component/aws2/ec2/springboot/AWS2EC2ComponentAutoConfiguration.java b/components-starter/camel-aws2-ec2-starter/src/main/java/org/apache/camel/component/aws2/ec2/springboot/AWS2EC2ComponentAutoConfiguration.java
index 0ded8d1..6f67ecb 100644
--- a/components-starter/camel-aws2-ec2-starter/src/main/java/org/apache/camel/component/aws2/ec2/springboot/AWS2EC2ComponentAutoConfiguration.java
+++ b/components-starter/camel-aws2-ec2-starter/src/main/java/org/apache/camel/component/aws2/ec2/springboot/AWS2EC2ComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,AWS2EC2ComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws2-ec2"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, AWS2EC2ComponentConverter.class})
public class AWS2EC2ComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class AWS2EC2ComponentAutoConfiguration {
public AWS2EC2ComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new AWS2EC2ComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-aws2-ec2-starter/src/main/java/org/apache/camel/component/aws2/ec2/springboot/AWS2EC2ComponentConverter.java b/components-starter/camel-aws2-ec2-starter/src/main/java/org/apache/camel/component/aws2/ec2/springboot/AWS2EC2ComponentConverter.java
index 7b5bda6..f98ffe6 100644
--- a/components-starter/camel-aws2-ec2-starter/src/main/java/org/apache/camel/component/aws2/ec2/springboot/AWS2EC2ComponentConverter.java
+++ b/components-starter/camel-aws2-ec2-starter/src/main/java/org/apache/camel/component/aws2/ec2/springboot/AWS2EC2ComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.aws2.ec2.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class AWS2EC2ComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class AWS2EC2ComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public AWS2EC2ComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -57,8 +59,8 @@ public class AWS2EC2ComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "software.amazon.awssdk.services.ec2.Ec2Client": return camelContext.getRegistry().lookupByNameAndType(ref, software.amazon.awssdk.services.ec2.Ec2Client.class);
- case "org.apache.camel.component.aws2.ec2.AWS2EC2Configuration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.aws2.ec2.AWS2EC2Configuration.class);
+ case "software.amazon.awssdk.services.ec2.Ec2Client": return applicationContext.getBean(ref, software.amazon.awssdk.services.ec2.Ec2Client.class);
+ case "org.apache.camel.component.aws2.ec2.AWS2EC2Configuration": return applicationContext.getBean(ref, org.apache.camel.component.aws2.ec2.AWS2EC2Configuration.class);
}
return null;
}
diff --git a/components-starter/camel-aws2-ec2-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-aws2-ec2-starter/src/main/resources/META-INF/spring.factories
index 624a8c5..f543002 100644
--- a/components-starter/camel-aws2-ec2-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-aws2-ec2-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.aws2.ec2.springboot.AWS2EC2ComponentAutoConfiguration
+org.apache.camel.component.aws2.ec2.springboot.AWS2EC2ComponentAutoConfiguration,\
+org.apache.camel.component.aws2.ec2.springboot.AWS2EC2ComponentConverter
+
diff --git a/components-starter/camel-aws2-ecs-starter/src/main/java/org/apache/camel/component/aws2/ecs/springboot/ECS2ComponentAutoConfiguration.java b/components-starter/camel-aws2-ecs-starter/src/main/java/org/apache/camel/component/aws2/ecs/springboot/ECS2ComponentAutoConfiguration.java
index 7e6d239..2c65db9 100644
--- a/components-starter/camel-aws2-ecs-starter/src/main/java/org/apache/camel/component/aws2/ecs/springboot/ECS2ComponentAutoConfiguration.java
+++ b/components-starter/camel-aws2-ecs-starter/src/main/java/org/apache/camel/component/aws2/ecs/springboot/ECS2ComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,ECS2ComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws2-ecs"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, ECS2ComponentConverter.class})
public class ECS2ComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class ECS2ComponentAutoConfiguration {
public ECS2ComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new ECS2ComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-aws2-ecs-starter/src/main/java/org/apache/camel/component/aws2/ecs/springboot/ECS2ComponentConverter.java b/components-starter/camel-aws2-ecs-starter/src/main/java/org/apache/camel/component/aws2/ecs/springboot/ECS2ComponentConverter.java
index e1082f0..32b1b66 100644
--- a/components-starter/camel-aws2-ecs-starter/src/main/java/org/apache/camel/component/aws2/ecs/springboot/ECS2ComponentConverter.java
+++ b/components-starter/camel-aws2-ecs-starter/src/main/java/org/apache/camel/component/aws2/ecs/springboot/ECS2ComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.aws2.ecs.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class ECS2ComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class ECS2ComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public ECS2ComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -57,8 +59,8 @@ public class ECS2ComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "org.apache.camel.component.aws2.ecs.ECS2Configuration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.aws2.ecs.ECS2Configuration.class);
- case "software.amazon.awssdk.services.ecs.EcsClient": return camelContext.getRegistry().lookupByNameAndType(ref, software.amazon.awssdk.services.ecs.EcsClient.class);
+ case "org.apache.camel.component.aws2.ecs.ECS2Configuration": return applicationContext.getBean(ref, org.apache.camel.component.aws2.ecs.ECS2Configuration.class);
+ case "software.amazon.awssdk.services.ecs.EcsClient": return applicationContext.getBean(ref, software.amazon.awssdk.services.ecs.EcsClient.class);
}
return null;
}
diff --git a/components-starter/camel-aws2-ecs-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-aws2-ecs-starter/src/main/resources/META-INF/spring.factories
index df1ee01..a8a0ad8 100644
--- a/components-starter/camel-aws2-ecs-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-aws2-ecs-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.aws2.ecs.springboot.ECS2ComponentAutoConfiguration
+org.apache.camel.component.aws2.ecs.springboot.ECS2ComponentAutoConfiguration,\
+org.apache.camel.component.aws2.ecs.springboot.ECS2ComponentConverter
+
diff --git a/components-starter/camel-aws2-eks-starter/src/main/java/org/apache/camel/component/aws2/eks/springboot/EKS2ComponentAutoConfiguration.java b/components-starter/camel-aws2-eks-starter/src/main/java/org/apache/camel/component/aws2/eks/springboot/EKS2ComponentAutoConfiguration.java
index c70edd1..6b65815 100644
--- a/components-starter/camel-aws2-eks-starter/src/main/java/org/apache/camel/component/aws2/eks/springboot/EKS2ComponentAutoConfiguration.java
+++ b/components-starter/camel-aws2-eks-starter/src/main/java/org/apache/camel/component/aws2/eks/springboot/EKS2ComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,EKS2ComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws2-eks"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, EKS2ComponentConverter.class})
public class EKS2ComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class EKS2ComponentAutoConfiguration {
public EKS2ComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new EKS2ComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-aws2-eks-starter/src/main/java/org/apache/camel/component/aws2/eks/springboot/EKS2ComponentConverter.java b/components-starter/camel-aws2-eks-starter/src/main/java/org/apache/camel/component/aws2/eks/springboot/EKS2ComponentConverter.java
index 4a5d26b..f5bbdbd 100644
--- a/components-starter/camel-aws2-eks-starter/src/main/java/org/apache/camel/component/aws2/eks/springboot/EKS2ComponentConverter.java
+++ b/components-starter/camel-aws2-eks-starter/src/main/java/org/apache/camel/component/aws2/eks/springboot/EKS2ComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.aws2.eks.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class EKS2ComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class EKS2ComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public EKS2ComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -57,8 +59,8 @@ public class EKS2ComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "org.apache.camel.component.aws2.eks.EKS2Configuration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.aws2.eks.EKS2Configuration.class);
- case "software.amazon.awssdk.services.eks.EksClient": return camelContext.getRegistry().lookupByNameAndType(ref, software.amazon.awssdk.services.eks.EksClient.class);
+ case "org.apache.camel.component.aws2.eks.EKS2Configuration": return applicationContext.getBean(ref, org.apache.camel.component.aws2.eks.EKS2Configuration.class);
+ case "software.amazon.awssdk.services.eks.EksClient": return applicationContext.getBean(ref, software.amazon.awssdk.services.eks.EksClient.class);
}
return null;
}
diff --git a/components-starter/camel-aws2-eks-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-aws2-eks-starter/src/main/resources/META-INF/spring.factories
index b7205df..d5f7993 100644
--- a/components-starter/camel-aws2-eks-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-aws2-eks-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.aws2.eks.springboot.EKS2ComponentAutoConfiguration
+org.apache.camel.component.aws2.eks.springboot.EKS2ComponentAutoConfiguration,\
+org.apache.camel.component.aws2.eks.springboot.EKS2ComponentConverter
+
diff --git a/components-starter/camel-aws2-eventbridge-starter/src/main/java/org/apache/camel/component/aws2/eventbridge/springboot/EventbridgeComponentAutoConfiguration.java b/components-starter/camel-aws2-eventbridge-starter/src/main/java/org/apache/camel/component/aws2/eventbridge/springboot/EventbridgeComponentAutoConfiguration.java
index 96cbd8f..371630c 100644
--- a/components-starter/camel-aws2-eventbridge-starter/src/main/java/org/apache/camel/component/aws2/eventbridge/springboot/EventbridgeComponentAutoConfiguration.java
+++ b/components-starter/camel-aws2-eventbridge-starter/src/main/java/org/apache/camel/component/aws2/eventbridge/springboot/EventbridgeComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,EventbridgeComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws2-eventbridge"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, EventbridgeComponentConverter.class})
public class EventbridgeComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class EventbridgeComponentAutoConfiguration {
public EventbridgeComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new EventbridgeComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-aws2-eventbridge-starter/src/main/java/org/apache/camel/component/aws2/eventbridge/springboot/EventbridgeComponentConverter.java b/components-starter/camel-aws2-eventbridge-starter/src/main/java/org/apache/camel/component/aws2/eventbridge/springboot/EventbridgeComponentConverter.java
index 8f88070..cda1652 100644
--- a/components-starter/camel-aws2-eventbridge-starter/src/main/java/org/apache/camel/component/aws2/eventbridge/springboot/EventbridgeComponentConverter.java
+++ b/components-starter/camel-aws2-eventbridge-starter/src/main/java/org/apache/camel/component/aws2/eventbridge/springboot/EventbridgeComponentConverter.java
@@ -19,24 +19,25 @@ package org.apache.camel.component.aws2.eventbridge.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class EventbridgeComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class EventbridgeComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public EventbridgeComponentConverter(
- org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -58,8 +59,8 @@ public class EventbridgeComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "org.apache.camel.component.aws2.eventbridge.EventbridgeConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.aws2.eventbridge.EventbridgeConfiguration.class);
- case "software.amazon.awssdk.services.eventbridge.EventBridgeClient": return camelContext.getRegistry().lookupByNameAndType(ref, software.amazon.awssdk.services.eventbridge.EventBridgeClient.class);
+ case "org.apache.camel.component.aws2.eventbridge.EventbridgeConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.aws2.eventbridge.EventbridgeConfiguration.class);
+ case "software.amazon.awssdk.services.eventbridge.EventBridgeClient": return applicationContext.getBean(ref, software.amazon.awssdk.services.eventbridge.EventBridgeClient.class);
}
return null;
}
diff --git a/components-starter/camel-aws2-eventbridge-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-aws2-eventbridge-starter/src/main/resources/META-INF/spring.factories
index b30164a..5f3c3ec 100644
--- a/components-starter/camel-aws2-eventbridge-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-aws2-eventbridge-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.aws2.eventbridge.springboot.EventbridgeComponentAutoConfiguration
+org.apache.camel.component.aws2.eventbridge.springboot.EventbridgeComponentAutoConfiguration,\
+org.apache.camel.component.aws2.eventbridge.springboot.EventbridgeComponentConverter
+
diff --git a/components-starter/camel-aws2-iam-starter/src/main/java/org/apache/camel/component/aws2/iam/springboot/IAM2ComponentAutoConfiguration.java b/components-starter/camel-aws2-iam-starter/src/main/java/org/apache/camel/component/aws2/iam/springboot/IAM2ComponentAutoConfiguration.java
index ea54f15..b427f1f 100644
--- a/components-starter/camel-aws2-iam-starter/src/main/java/org/apache/camel/component/aws2/iam/springboot/IAM2ComponentAutoConfiguration.java
+++ b/components-starter/camel-aws2-iam-starter/src/main/java/org/apache/camel/component/aws2/iam/springboot/IAM2ComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,IAM2ComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws2-iam"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, IAM2ComponentConverter.class})
public class IAM2ComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class IAM2ComponentAutoConfiguration {
public IAM2ComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new IAM2ComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-aws2-iam-starter/src/main/java/org/apache/camel/component/aws2/iam/springboot/IAM2ComponentConverter.java b/components-starter/camel-aws2-iam-starter/src/main/java/org/apache/camel/component/aws2/iam/springboot/IAM2ComponentConverter.java
index 382e23b..e9b0111 100644
--- a/components-starter/camel-aws2-iam-starter/src/main/java/org/apache/camel/component/aws2/iam/springboot/IAM2ComponentConverter.java
+++ b/components-starter/camel-aws2-iam-starter/src/main/java/org/apache/camel/component/aws2/iam/springboot/IAM2ComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.aws2.iam.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class IAM2ComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class IAM2ComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public IAM2ComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -57,8 +59,8 @@ public class IAM2ComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "org.apache.camel.component.aws2.iam.IAM2Configuration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.aws2.iam.IAM2Configuration.class);
- case "software.amazon.awssdk.services.iam.IamClient": return camelContext.getRegistry().lookupByNameAndType(ref, software.amazon.awssdk.services.iam.IamClient.class);
+ case "org.apache.camel.component.aws2.iam.IAM2Configuration": return applicationContext.getBean(ref, org.apache.camel.component.aws2.iam.IAM2Configuration.class);
+ case "software.amazon.awssdk.services.iam.IamClient": return applicationContext.getBean(ref, software.amazon.awssdk.services.iam.IamClient.class);
}
return null;
}
diff --git a/components-starter/camel-aws2-iam-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-aws2-iam-starter/src/main/resources/META-INF/spring.factories
index 83911ea..07e49ac 100644
--- a/components-starter/camel-aws2-iam-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-aws2-iam-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.aws2.iam.springboot.IAM2ComponentAutoConfiguration
+org.apache.camel.component.aws2.iam.springboot.IAM2ComponentAutoConfiguration,\
+org.apache.camel.component.aws2.iam.springboot.IAM2ComponentConverter
+
diff --git a/components-starter/camel-aws2-kinesis-starter/src/main/java/org/apache/camel/component/aws2/firehose/springboot/KinesisFirehose2ComponentAutoConfiguration.java b/components-starter/camel-aws2-kinesis-starter/src/main/java/org/apache/camel/component/aws2/firehose/springboot/KinesisFirehose2ComponentAutoConfiguration.java
index a49964d..ed62af2 100644
--- a/components-starter/camel-aws2-kinesis-starter/src/main/java/org/apache/camel/component/aws2/firehose/springboot/KinesisFirehose2ComponentAutoConfiguration.java
+++ b/components-starter/camel-aws2-kinesis-starter/src/main/java/org/apache/camel/component/aws2/firehose/springboot/KinesisFirehose2ComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,KinesisFirehose2ComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws2-kinesis-firehose"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, KinesisFirehose2ComponentConverter.class})
public class KinesisFirehose2ComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class KinesisFirehose2ComponentAutoConfiguration {
public KinesisFirehose2ComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new KinesisFirehose2ComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-aws2-kinesis-starter/src/main/java/org/apache/camel/component/aws2/firehose/springboot/KinesisFirehose2ComponentConverter.java b/components-starter/camel-aws2-kinesis-starter/src/main/java/org/apache/camel/component/aws2/firehose/springboot/KinesisFirehose2ComponentConverter.java
index c520431..b16018d 100644
--- a/components-starter/camel-aws2-kinesis-starter/src/main/java/org/apache/camel/component/aws2/firehose/springboot/KinesisFirehose2ComponentConverter.java
+++ b/components-starter/camel-aws2-kinesis-starter/src/main/java/org/apache/camel/component/aws2/firehose/springboot/KinesisFirehose2ComponentConverter.java
@@ -19,24 +19,25 @@ package org.apache.camel.component.aws2.firehose.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class KinesisFirehose2ComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class KinesisFirehose2ComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public KinesisFirehose2ComponentConverter(
- org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -58,8 +59,8 @@ public class KinesisFirehose2ComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "software.amazon.awssdk.services.firehose.FirehoseClient": return camelContext.getRegistry().lookupByNameAndType(ref, software.amazon.awssdk.services.firehose.FirehoseClient.class);
- case "org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration.class);
+ case "software.amazon.awssdk.services.firehose.FirehoseClient": return applicationContext.getBean(ref, software.amazon.awssdk.services.firehose.FirehoseClient.class);
+ case "org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration": return applicationContext.getBean(ref, org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration.class);
}
return null;
}
diff --git a/components-starter/camel-aws2-kinesis-starter/src/main/java/org/apache/camel/component/aws2/kinesis/springboot/Kinesis2ComponentAutoConfiguration.java b/components-starter/camel-aws2-kinesis-starter/src/main/java/org/apache/camel/component/aws2/kinesis/springboot/Kinesis2ComponentAutoConfiguration.java
index 9291acd..05f4151 100644
--- a/components-starter/camel-aws2-kinesis-starter/src/main/java/org/apache/camel/component/aws2/kinesis/springboot/Kinesis2ComponentAutoConfiguration.java
+++ b/components-starter/camel-aws2-kinesis-starter/src/main/java/org/apache/camel/component/aws2/kinesis/springboot/Kinesis2ComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,Kinesis2ComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws2-kinesis"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, Kinesis2ComponentConverter.class})
public class Kinesis2ComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class Kinesis2ComponentAutoConfiguration {
public Kinesis2ComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new Kinesis2ComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-aws2-kinesis-starter/src/main/java/org/apache/camel/component/aws2/kinesis/springboot/Kinesis2ComponentConverter.java b/components-starter/camel-aws2-kinesis-starter/src/main/java/org/apache/camel/component/aws2/kinesis/springboot/Kinesis2ComponentConverter.java
index c8a0cd7..9452f49 100644
--- a/components-starter/camel-aws2-kinesis-starter/src/main/java/org/apache/camel/component/aws2/kinesis/springboot/Kinesis2ComponentConverter.java
+++ b/components-starter/camel-aws2-kinesis-starter/src/main/java/org/apache/camel/component/aws2/kinesis/springboot/Kinesis2ComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.aws2.kinesis.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class Kinesis2ComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class Kinesis2ComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public Kinesis2ComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -57,8 +59,8 @@ public class Kinesis2ComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "software.amazon.awssdk.services.kinesis.KinesisClient": return camelContext.getRegistry().lookupByNameAndType(ref, software.amazon.awssdk.services.kinesis.KinesisClient.class);
- case "org.apache.camel.component.aws2.kinesis.Kinesis2Configuration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.aws2.kinesis.Kinesis2Configuration.class);
+ case "software.amazon.awssdk.services.kinesis.KinesisClient": return applicationContext.getBean(ref, software.amazon.awssdk.services.kinesis.KinesisClient.class);
+ case "org.apache.camel.component.aws2.kinesis.Kinesis2Configuration": return applicationContext.getBean(ref, org.apache.camel.component.aws2.kinesis.Kinesis2Configuration.class);
}
return null;
}
diff --git a/components-starter/camel-aws2-kinesis-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-aws2-kinesis-starter/src/main/resources/META-INF/spring.factories
index 28b5dee..3e4dc3b 100644
--- a/components-starter/camel-aws2-kinesis-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-aws2-kinesis-starter/src/main/resources/META-INF/spring.factories
@@ -17,5 +17,9 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
org.apache.camel.component.aws2.firehose.springboot.KinesisFirehose2ComponentAutoConfiguration,\
-org.apache.camel.component.aws2.kinesis.springboot.Kinesis2ComponentAutoConfiguration
+org.apache.camel.component.aws2.kinesis.springboot.Kinesis2ComponentAutoConfiguration,\
+org.apache.camel.component.aws2.firehose.springboot.KinesisFirehose2ComponentConverter,\
+org.apache.camel.component.aws2.kinesis.springboot.Kinesis2ComponentConverter
+
+
diff --git a/components-starter/camel-aws2-kms-starter/src/main/java/org/apache/camel/component/aws2/kms/springboot/KMS2ComponentAutoConfiguration.java b/components-starter/camel-aws2-kms-starter/src/main/java/org/apache/camel/component/aws2/kms/springboot/KMS2ComponentAutoConfiguration.java
index d77f7e0..d092f14 100644
--- a/components-starter/camel-aws2-kms-starter/src/main/java/org/apache/camel/component/aws2/kms/springboot/KMS2ComponentAutoConfiguration.java
+++ b/components-starter/camel-aws2-kms-starter/src/main/java/org/apache/camel/component/aws2/kms/springboot/KMS2ComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,KMS2ComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws2-kms"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, KMS2ComponentConverter.class})
public class KMS2ComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class KMS2ComponentAutoConfiguration {
public KMS2ComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new KMS2ComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-aws2-kms-starter/src/main/java/org/apache/camel/component/aws2/kms/springboot/KMS2ComponentConverter.java b/components-starter/camel-aws2-kms-starter/src/main/java/org/apache/camel/component/aws2/kms/springboot/KMS2ComponentConverter.java
index 4870aee..463ebf0 100644
--- a/components-starter/camel-aws2-kms-starter/src/main/java/org/apache/camel/component/aws2/kms/springboot/KMS2ComponentConverter.java
+++ b/components-starter/camel-aws2-kms-starter/src/main/java/org/apache/camel/component/aws2/kms/springboot/KMS2ComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.aws2.kms.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class KMS2ComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class KMS2ComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public KMS2ComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -57,8 +59,8 @@ public class KMS2ComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "org.apache.camel.component.aws2.kms.KMS2Configuration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.aws2.kms.KMS2Configuration.class);
- case "software.amazon.awssdk.services.kms.KmsClient": return camelContext.getRegistry().lookupByNameAndType(ref, software.amazon.awssdk.services.kms.KmsClient.class);
+ case "org.apache.camel.component.aws2.kms.KMS2Configuration": return applicationContext.getBean(ref, org.apache.camel.component.aws2.kms.KMS2Configuration.class);
+ case "software.amazon.awssdk.services.kms.KmsClient": return applicationContext.getBean(ref, software.amazon.awssdk.services.kms.KmsClient.class);
}
return null;
}
diff --git a/components-starter/camel-aws2-kms-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-aws2-kms-starter/src/main/resources/META-INF/spring.factories
index 3b35856..abff754 100644
--- a/components-starter/camel-aws2-kms-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-aws2-kms-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.aws2.kms.springboot.KMS2ComponentAutoConfiguration
+org.apache.camel.component.aws2.kms.springboot.KMS2ComponentAutoConfiguration,\
+org.apache.camel.component.aws2.kms.springboot.KMS2ComponentConverter
+
diff --git a/components-starter/camel-aws2-lambda-starter/src/main/java/org/apache/camel/component/aws2/lambda/springboot/Lambda2ComponentAutoConfiguration.java b/components-starter/camel-aws2-lambda-starter/src/main/java/org/apache/camel/component/aws2/lambda/springboot/Lambda2ComponentAutoConfiguration.java
index d620617..aafa5f8 100644
--- a/components-starter/camel-aws2-lambda-starter/src/main/java/org/apache/camel/component/aws2/lambda/springboot/Lambda2ComponentAutoConfiguration.java
+++ b/components-starter/camel-aws2-lambda-starter/src/main/java/org/apache/camel/component/aws2/lambda/springboot/Lambda2ComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,Lambda2ComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws2-lambda"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, Lambda2ComponentConverter.class})
public class Lambda2ComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class Lambda2ComponentAutoConfiguration {
public Lambda2ComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new Lambda2ComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-aws2-lambda-starter/src/main/java/org/apache/camel/component/aws2/lambda/springboot/Lambda2ComponentConverter.java b/components-starter/camel-aws2-lambda-starter/src/main/java/org/apache/camel/component/aws2/lambda/springboot/Lambda2ComponentConverter.java
index a245730..ceebf0a 100644
--- a/components-starter/camel-aws2-lambda-starter/src/main/java/org/apache/camel/component/aws2/lambda/springboot/Lambda2ComponentConverter.java
+++ b/components-starter/camel-aws2-lambda-starter/src/main/java/org/apache/camel/component/aws2/lambda/springboot/Lambda2ComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.aws2.lambda.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class Lambda2ComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class Lambda2ComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public Lambda2ComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -57,8 +59,8 @@ public class Lambda2ComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "org.apache.camel.component.aws2.lambda.Lambda2Configuration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.aws2.lambda.Lambda2Configuration.class);
- case "software.amazon.awssdk.services.lambda.LambdaClient": return camelContext.getRegistry().lookupByNameAndType(ref, software.amazon.awssdk.services.lambda.LambdaClient.class);
+ case "org.apache.camel.component.aws2.lambda.Lambda2Configuration": return applicationContext.getBean(ref, org.apache.camel.component.aws2.lambda.Lambda2Configuration.class);
+ case "software.amazon.awssdk.services.lambda.LambdaClient": return applicationContext.getBean(ref, software.amazon.awssdk.services.lambda.LambdaClient.class);
}
return null;
}
diff --git a/components-starter/camel-aws2-lambda-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-aws2-lambda-starter/src/main/resources/META-INF/spring.factories
index d29660a..fdd631a 100644
--- a/components-starter/camel-aws2-lambda-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-aws2-lambda-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.aws2.lambda.springboot.Lambda2ComponentAutoConfiguration
+org.apache.camel.component.aws2.lambda.springboot.Lambda2ComponentAutoConfiguration,\
+org.apache.camel.component.aws2.lambda.springboot.Lambda2ComponentConverter
+
diff --git a/components-starter/camel-aws2-mq-starter/src/main/java/org/apache/camel/component/aws2/mq/springboot/MQ2ComponentAutoConfiguration.java b/components-starter/camel-aws2-mq-starter/src/main/java/org/apache/camel/component/aws2/mq/springboot/MQ2ComponentAutoConfiguration.java
index de2df5f..d823003 100644
--- a/components-starter/camel-aws2-mq-starter/src/main/java/org/apache/camel/component/aws2/mq/springboot/MQ2ComponentAutoConfiguration.java
+++ b/components-starter/camel-aws2-mq-starter/src/main/java/org/apache/camel/component/aws2/mq/springboot/MQ2ComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,MQ2ComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws2-mq"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, MQ2ComponentConverter.class})
public class MQ2ComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class MQ2ComponentAutoConfiguration {
public MQ2ComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new MQ2ComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-aws2-mq-starter/src/main/java/org/apache/camel/component/aws2/mq/springboot/MQ2ComponentConverter.java b/components-starter/camel-aws2-mq-starter/src/main/java/org/apache/camel/component/aws2/mq/springboot/MQ2ComponentConverter.java
index c6e477a..3cbf734 100644
--- a/components-starter/camel-aws2-mq-starter/src/main/java/org/apache/camel/component/aws2/mq/springboot/MQ2ComponentConverter.java
+++ b/components-starter/camel-aws2-mq-starter/src/main/java/org/apache/camel/component/aws2/mq/springboot/MQ2ComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.aws2.mq.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class MQ2ComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class MQ2ComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public MQ2ComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -57,8 +59,8 @@ public class MQ2ComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "software.amazon.awssdk.services.mq.MqClient": return camelContext.getRegistry().lookupByNameAndType(ref, software.amazon.awssdk.services.mq.MqClient.class);
- case "org.apache.camel.component.aws2.mq.MQ2Configuration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.aws2.mq.MQ2Configuration.class);
+ case "software.amazon.awssdk.services.mq.MqClient": return applicationContext.getBean(ref, software.amazon.awssdk.services.mq.MqClient.class);
+ case "org.apache.camel.component.aws2.mq.MQ2Configuration": return applicationContext.getBean(ref, org.apache.camel.component.aws2.mq.MQ2Configuration.class);
}
return null;
}
diff --git a/components-starter/camel-aws2-mq-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-aws2-mq-starter/src/main/resources/META-INF/spring.factories
index 9a57305..b77d28e 100644
--- a/components-starter/camel-aws2-mq-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-aws2-mq-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.aws2.mq.springboot.MQ2ComponentAutoConfiguration
+org.apache.camel.component.aws2.mq.springboot.MQ2ComponentAutoConfiguration,\
+org.apache.camel.component.aws2.mq.springboot.MQ2ComponentConverter
+
diff --git a/components-starter/camel-aws2-msk-starter/src/main/java/org/apache/camel/component/aws2/msk/springboot/MSK2ComponentAutoConfiguration.java b/components-starter/camel-aws2-msk-starter/src/main/java/org/apache/camel/component/aws2/msk/springboot/MSK2ComponentAutoConfiguration.java
index ad06452..207a88a 100644
--- a/components-starter/camel-aws2-msk-starter/src/main/java/org/apache/camel/component/aws2/msk/springboot/MSK2ComponentAutoConfiguration.java
+++ b/components-starter/camel-aws2-msk-starter/src/main/java/org/apache/camel/component/aws2/msk/springboot/MSK2ComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,MSK2ComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws2-msk"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, MSK2ComponentConverter.class})
public class MSK2ComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class MSK2ComponentAutoConfiguration {
public MSK2ComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new MSK2ComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-aws2-msk-starter/src/main/java/org/apache/camel/component/aws2/msk/springboot/MSK2ComponentConverter.java b/components-starter/camel-aws2-msk-starter/src/main/java/org/apache/camel/component/aws2/msk/springboot/MSK2ComponentConverter.java
index ded6830..fac9154 100644
--- a/components-starter/camel-aws2-msk-starter/src/main/java/org/apache/camel/component/aws2/msk/springboot/MSK2ComponentConverter.java
+++ b/components-starter/camel-aws2-msk-starter/src/main/java/org/apache/camel/component/aws2/msk/springboot/MSK2ComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.aws2.msk.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class MSK2ComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class MSK2ComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public MSK2ComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -57,8 +59,8 @@ public class MSK2ComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "org.apache.camel.component.aws2.msk.MSK2Configuration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.aws2.msk.MSK2Configuration.class);
- case "software.amazon.awssdk.services.kafka.KafkaClient": return camelContext.getRegistry().lookupByNameAndType(ref, software.amazon.awssdk.services.kafka.KafkaClient.class);
+ case "org.apache.camel.component.aws2.msk.MSK2Configuration": return applicationContext.getBean(ref, org.apache.camel.component.aws2.msk.MSK2Configuration.class);
+ case "software.amazon.awssdk.services.kafka.KafkaClient": return applicationContext.getBean(ref, software.amazon.awssdk.services.kafka.KafkaClient.class);
}
return null;
}
diff --git a/components-starter/camel-aws2-msk-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-aws2-msk-starter/src/main/resources/META-INF/spring.factories
index f073c6d..714d97a 100644
--- a/components-starter/camel-aws2-msk-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-aws2-msk-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.aws2.msk.springboot.MSK2ComponentAutoConfiguration
+org.apache.camel.component.aws2.msk.springboot.MSK2ComponentAutoConfiguration,\
+org.apache.camel.component.aws2.msk.springboot.MSK2ComponentConverter
+
diff --git a/components-starter/camel-aws2-s3-starter/src/main/java/org/apache/camel/component/aws2/s3/springboot/AWS2S3ComponentAutoConfiguration.java b/components-starter/camel-aws2-s3-starter/src/main/java/org/apache/camel/component/aws2/s3/springboot/AWS2S3ComponentAutoConfiguration.java
index e32067c..bd44b83 100644
--- a/components-starter/camel-aws2-s3-starter/src/main/java/org/apache/camel/component/aws2/s3/springboot/AWS2S3ComponentAutoConfiguration.java
+++ b/components-starter/camel-aws2-s3-starter/src/main/java/org/apache/camel/component/aws2/s3/springboot/AWS2S3ComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,AWS2S3ComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws2-s3"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, AWS2S3ComponentConverter.class})
public class AWS2S3ComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class AWS2S3ComponentAutoConfiguration {
public AWS2S3ComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new AWS2S3ComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-aws2-s3-starter/src/main/java/org/apache/camel/component/aws2/s3/springboot/AWS2S3ComponentConverter.java b/components-starter/camel-aws2-s3-starter/src/main/java/org/apache/camel/component/aws2/s3/springboot/AWS2S3ComponentConverter.java
index 6c6dc21..d41c537 100644
--- a/components-starter/camel-aws2-s3-starter/src/main/java/org/apache/camel/component/aws2/s3/springboot/AWS2S3ComponentConverter.java
+++ b/components-starter/camel-aws2-s3-starter/src/main/java/org/apache/camel/component/aws2/s3/springboot/AWS2S3ComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.aws2.s3.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class AWS2S3ComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class AWS2S3ComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public AWS2S3ComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -58,9 +60,9 @@ public class AWS2S3ComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "software.amazon.awssdk.services.s3.S3Client": return camelContext.getRegistry().lookupByNameAndType(ref, software.amazon.awssdk.services.s3.S3Client.class);
- case "software.amazon.awssdk.services.s3.presigner.S3Presigner": return camelContext.getRegistry().lookupByNameAndType(ref, software.amazon.awssdk.services.s3.presigner.S3Presigner.class);
- case "org.apache.camel.component.aws2.s3.AWS2S3Configuration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.aws2.s3.AWS2S3Configuration.class);
+ case "software.amazon.awssdk.services.s3.S3Client": return applicationContext.getBean(ref, software.amazon.awssdk.services.s3.S3Client.class);
+ case "software.amazon.awssdk.services.s3.presigner.S3Presigner": return applicationContext.getBean(ref, software.amazon.awssdk.services.s3.presigner.S3Presigner.class);
+ case "org.apache.camel.component.aws2.s3.AWS2S3Configuration": return applicationContext.getBean(ref, org.apache.camel.component.aws2.s3.AWS2S3Configuration.class);
}
return null;
}
diff --git a/components-starter/camel-aws2-s3-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-aws2-s3-starter/src/main/resources/META-INF/spring.factories
index 00dda88..466982e 100644
--- a/components-starter/camel-aws2-s3-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-aws2-s3-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.aws2.s3.springboot.AWS2S3ComponentAutoConfiguration
+org.apache.camel.component.aws2.s3.springboot.AWS2S3ComponentAutoConfiguration,\
+org.apache.camel.component.aws2.s3.springboot.AWS2S3ComponentConverter
+
diff --git a/components-starter/camel-aws2-ses-starter/src/main/java/org/apache/camel/component/aws2/ses/springboot/Ses2ComponentAutoConfiguration.java b/components-starter/camel-aws2-ses-starter/src/main/java/org/apache/camel/component/aws2/ses/springboot/Ses2ComponentAutoConfiguration.java
index af60d1f..fc29284 100644
--- a/components-starter/camel-aws2-ses-starter/src/main/java/org/apache/camel/component/aws2/ses/springboot/Ses2ComponentAutoConfiguration.java
+++ b/components-starter/camel-aws2-ses-starter/src/main/java/org/apache/camel/component/aws2/ses/springboot/Ses2ComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,Ses2ComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws2-ses"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, Ses2ComponentConverter.class})
public class Ses2ComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class Ses2ComponentAutoConfiguration {
public Ses2ComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new Ses2ComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-aws2-ses-starter/src/main/java/org/apache/camel/component/aws2/ses/springboot/Ses2ComponentConverter.java b/components-starter/camel-aws2-ses-starter/src/main/java/org/apache/camel/component/aws2/ses/springboot/Ses2ComponentConverter.java
index 7926287..3ccd3ab 100644
--- a/components-starter/camel-aws2-ses-starter/src/main/java/org/apache/camel/component/aws2/ses/springboot/Ses2ComponentConverter.java
+++ b/components-starter/camel-aws2-ses-starter/src/main/java/org/apache/camel/component/aws2/ses/springboot/Ses2ComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.aws2.ses.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class Ses2ComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class Ses2ComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public Ses2ComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -57,8 +59,8 @@ public class Ses2ComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "software.amazon.awssdk.services.ses.SesClient": return camelContext.getRegistry().lookupByNameAndType(ref, software.amazon.awssdk.services.ses.SesClient.class);
- case "org.apache.camel.component.aws2.ses.Ses2Configuration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.aws2.ses.Ses2Configuration.class);
+ case "software.amazon.awssdk.services.ses.SesClient": return applicationContext.getBean(ref, software.amazon.awssdk.services.ses.SesClient.class);
+ case "org.apache.camel.component.aws2.ses.Ses2Configuration": return applicationContext.getBean(ref, org.apache.camel.component.aws2.ses.Ses2Configuration.class);
}
return null;
}
diff --git a/components-starter/camel-aws2-ses-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-aws2-ses-starter/src/main/resources/META-INF/spring.factories
index dc16971..a391271 100644
--- a/components-starter/camel-aws2-ses-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-aws2-ses-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.aws2.ses.springboot.Ses2ComponentAutoConfiguration
+org.apache.camel.component.aws2.ses.springboot.Ses2ComponentAutoConfiguration,\
+org.apache.camel.component.aws2.ses.springboot.Ses2ComponentConverter
+
diff --git a/components-starter/camel-aws2-sns-starter/src/main/java/org/apache/camel/component/aws2/sns/springboot/Sns2ComponentAutoConfiguration.java b/components-starter/camel-aws2-sns-starter/src/main/java/org/apache/camel/component/aws2/sns/springboot/Sns2ComponentAutoConfiguration.java
index 821cd86..fb2f93d 100644
--- a/components-starter/camel-aws2-sns-starter/src/main/java/org/apache/camel/component/aws2/sns/springboot/Sns2ComponentAutoConfiguration.java
+++ b/components-starter/camel-aws2-sns-starter/src/main/java/org/apache/camel/component/aws2/sns/springboot/Sns2ComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,Sns2ComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws2-sns"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, Sns2ComponentConverter.class})
public class Sns2ComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class Sns2ComponentAutoConfiguration {
public Sns2ComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new Sns2ComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-aws2-sns-starter/src/main/java/org/apache/camel/component/aws2/sns/springboot/Sns2ComponentConverter.java b/components-starter/camel-aws2-sns-starter/src/main/java/org/apache/camel/component/aws2/sns/springboot/Sns2ComponentConverter.java
index 6959f97..0327c7e 100644
--- a/components-starter/camel-aws2-sns-starter/src/main/java/org/apache/camel/component/aws2/sns/springboot/Sns2ComponentConverter.java
+++ b/components-starter/camel-aws2-sns-starter/src/main/java/org/apache/camel/component/aws2/sns/springboot/Sns2ComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.aws2.sns.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class Sns2ComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class Sns2ComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public Sns2ComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -57,8 +59,8 @@ public class Sns2ComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "software.amazon.awssdk.services.sns.SnsClient": return camelContext.getRegistry().lookupByNameAndType(ref, software.amazon.awssdk.services.sns.SnsClient.class);
- case "org.apache.camel.component.aws2.sns.Sns2Configuration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.aws2.sns.Sns2Configuration.class);
+ case "software.amazon.awssdk.services.sns.SnsClient": return applicationContext.getBean(ref, software.amazon.awssdk.services.sns.SnsClient.class);
+ case "org.apache.camel.component.aws2.sns.Sns2Configuration": return applicationContext.getBean(ref, org.apache.camel.component.aws2.sns.Sns2Configuration.class);
}
return null;
}
diff --git a/components-starter/camel-aws2-sns-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-aws2-sns-starter/src/main/resources/META-INF/spring.factories
index 0b2fcb3..66b3516 100644
--- a/components-starter/camel-aws2-sns-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-aws2-sns-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.aws2.sns.springboot.Sns2ComponentAutoConfiguration
+org.apache.camel.component.aws2.sns.springboot.Sns2ComponentAutoConfiguration,\
+org.apache.camel.component.aws2.sns.springboot.Sns2ComponentConverter
+
diff --git a/components-starter/camel-aws2-sqs-starter/src/main/java/org/apache/camel/component/aws2/sqs/springboot/Sqs2ComponentAutoConfiguration.java b/components-starter/camel-aws2-sqs-starter/src/main/java/org/apache/camel/component/aws2/sqs/springboot/Sqs2ComponentAutoConfiguration.java
index c580765..a133679 100644
--- a/components-starter/camel-aws2-sqs-starter/src/main/java/org/apache/camel/component/aws2/sqs/springboot/Sqs2ComponentAutoConfiguration.java
+++ b/components-starter/camel-aws2-sqs-starter/src/main/java/org/apache/camel/component/aws2/sqs/springboot/Sqs2ComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,Sqs2ComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws2-sqs"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, Sqs2ComponentConverter.class})
public class Sqs2ComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class Sqs2ComponentAutoConfiguration {
public Sqs2ComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new Sqs2ComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-aws2-sqs-starter/src/main/java/org/apache/camel/component/aws2/sqs/springboot/Sqs2ComponentConverter.java b/components-starter/camel-aws2-sqs-starter/src/main/java/org/apache/camel/component/aws2/sqs/springboot/Sqs2ComponentConverter.java
index 00ab3b0..e26df16 100644
--- a/components-starter/camel-aws2-sqs-starter/src/main/java/org/apache/camel/component/aws2/sqs/springboot/Sqs2ComponentConverter.java
+++ b/components-starter/camel-aws2-sqs-starter/src/main/java/org/apache/camel/component/aws2/sqs/springboot/Sqs2ComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.aws2.sqs.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class Sqs2ComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class Sqs2ComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public Sqs2ComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -57,8 +59,8 @@ public class Sqs2ComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "software.amazon.awssdk.services.sqs.SqsClient": return camelContext.getRegistry().lookupByNameAndType(ref, software.amazon.awssdk.services.sqs.SqsClient.class);
- case "org.apache.camel.component.aws2.sqs.Sqs2Configuration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.aws2.sqs.Sqs2Configuration.class);
+ case "software.amazon.awssdk.services.sqs.SqsClient": return applicationContext.getBean(ref, software.amazon.awssdk.services.sqs.SqsClient.class);
+ case "org.apache.camel.component.aws2.sqs.Sqs2Configuration": return applicationContext.getBean(ref, org.apache.camel.component.aws2.sqs.Sqs2Configuration.class);
}
return null;
}
diff --git a/components-starter/camel-aws2-sqs-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-aws2-sqs-starter/src/main/resources/META-INF/spring.factories
index c4ee527..b14d5dd 100644
--- a/components-starter/camel-aws2-sqs-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-aws2-sqs-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.aws2.sqs.springboot.Sqs2ComponentAutoConfiguration
+org.apache.camel.component.aws2.sqs.springboot.Sqs2ComponentAutoConfiguration,\
+org.apache.camel.component.aws2.sqs.springboot.Sqs2ComponentConverter
+
diff --git a/components-starter/camel-aws2-sts-starter/src/main/java/org/apache/camel/component/aws2/sts/springboot/STS2ComponentAutoConfiguration.java b/components-starter/camel-aws2-sts-starter/src/main/java/org/apache/camel/component/aws2/sts/springboot/STS2ComponentAutoConfiguration.java
index a50a31f..fa5a0c8 100644
--- a/components-starter/camel-aws2-sts-starter/src/main/java/org/apache/camel/component/aws2/sts/springboot/STS2ComponentAutoConfiguration.java
+++ b/components-starter/camel-aws2-sts-starter/src/main/java/org/apache/camel/component/aws2/sts/springboot/STS2ComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,STS2ComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws2-sts"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, STS2ComponentConverter.class})
public class STS2ComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class STS2ComponentAutoConfiguration {
public STS2ComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new STS2ComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-aws2-sts-starter/src/main/java/org/apache/camel/component/aws2/sts/springboot/STS2ComponentConverter.java b/components-starter/camel-aws2-sts-starter/src/main/java/org/apache/camel/component/aws2/sts/springboot/STS2ComponentConverter.java
index 23376dd..d68376d 100644
--- a/components-starter/camel-aws2-sts-starter/src/main/java/org/apache/camel/component/aws2/sts/springboot/STS2ComponentConverter.java
+++ b/components-starter/camel-aws2-sts-starter/src/main/java/org/apache/camel/component/aws2/sts/springboot/STS2ComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.aws2.sts.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class STS2ComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class STS2ComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public STS2ComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -57,8 +59,8 @@ public class STS2ComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "org.apache.camel.component.aws2.sts.STS2Configuration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.aws2.sts.STS2Configuration.class);
- case "software.amazon.awssdk.services.sts.StsClient": return camelContext.getRegistry().lookupByNameAndType(ref, software.amazon.awssdk.services.sts.StsClient.class);
+ case "org.apache.camel.component.aws2.sts.STS2Configuration": return applicationContext.getBean(ref, org.apache.camel.component.aws2.sts.STS2Configuration.class);
+ case "software.amazon.awssdk.services.sts.StsClient": return applicationContext.getBean(ref, software.amazon.awssdk.services.sts.StsClient.class);
}
return null;
}
diff --git a/components-starter/camel-aws2-sts-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-aws2-sts-starter/src/main/resources/META-INF/spring.factories
index d35215d..58fc26f 100644
--- a/components-starter/camel-aws2-sts-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-aws2-sts-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.aws2.sts.springboot.STS2ComponentAutoConfiguration
+org.apache.camel.component.aws2.sts.springboot.STS2ComponentAutoConfiguration,\
+org.apache.camel.component.aws2.sts.springboot.STS2ComponentConverter
+
diff --git a/components-starter/camel-aws2-translate-starter/src/main/java/org/apache/camel/component/aws2/translate/springboot/Translate2ComponentAutoConfiguration.java b/components-starter/camel-aws2-translate-starter/src/main/java/org/apache/camel/component/aws2/translate/springboot/Translate2ComponentAutoConfiguration.java
index 827c167..6e33ec1 100644
--- a/components-starter/camel-aws2-translate-starter/src/main/java/org/apache/camel/component/aws2/translate/springboot/Translate2ComponentAutoConfiguration.java
+++ b/components-starter/camel-aws2-translate-starter/src/main/java/org/apache/camel/component/aws2/translate/springboot/Translate2ComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,Translate2ComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.aws2-translate"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, Translate2ComponentConverter.class})
public class Translate2ComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class Translate2ComponentAutoConfiguration {
public Translate2ComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new Translate2ComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-aws2-translate-starter/src/main/java/org/apache/camel/component/aws2/translate/springboot/Translate2ComponentConverter.java b/components-starter/camel-aws2-translate-starter/src/main/java/org/apache/camel/component/aws2/translate/springboot/Translate2ComponentConverter.java
index 40d2fef..1a91d96 100644
--- a/components-starter/camel-aws2-translate-starter/src/main/java/org/apache/camel/component/aws2/translate/springboot/Translate2ComponentConverter.java
+++ b/components-starter/camel-aws2-translate-starter/src/main/java/org/apache/camel/component/aws2/translate/springboot/Translate2ComponentConverter.java
@@ -19,24 +19,25 @@ package org.apache.camel.component.aws2.translate.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class Translate2ComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class Translate2ComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public Translate2ComponentConverter(
- org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -58,8 +59,8 @@ public class Translate2ComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "org.apache.camel.component.aws2.translate.Translate2Configuration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.aws2.translate.Translate2Configuration.class);
- case "software.amazon.awssdk.services.translate.TranslateClient": return camelContext.getRegistry().lookupByNameAndType(ref, software.amazon.awssdk.services.translate.TranslateClient.class);
+ case "org.apache.camel.component.aws2.translate.Translate2Configuration": return applicationContext.getBean(ref, org.apache.camel.component.aws2.translate.Translate2Configuration.class);
+ case "software.amazon.awssdk.services.translate.TranslateClient": return applicationContext.getBean(ref, software.amazon.awssdk.services.translate.TranslateClient.class);
}
return null;
}
diff --git a/components-starter/camel-aws2-translate-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-aws2-translate-starter/src/main/resources/META-INF/spring.factories
index 077c395..e9c0e07 100644
--- a/components-starter/camel-aws2-translate-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-aws2-translate-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.aws2.translate.springboot.Translate2ComponentAutoConfiguration
+org.apache.camel.component.aws2.translate.springboot.Translate2ComponentAutoConfiguration,\
+org.apache.camel.component.aws2.translate.springboot.Translate2ComponentConverter
+
diff --git a/components-starter/camel-azure-eventhubs-starter/src/main/java/org/apache/camel/component/azure/eventhubs/springboot/EventHubsComponentAutoConfiguration.java b/components-starter/camel-azure-eventhubs-starter/src/main/java/org/apache/camel/component/azure/eventhubs/springboot/EventHubsComponentAutoConfiguration.java
index cb0fb92..c16b92d 100644
--- a/components-starter/camel-azure-eventhubs-starter/src/main/java/org/apache/camel/component/azure/eventhubs/springboot/EventHubsComponentAutoConfiguration.java
+++ b/components-starter/camel-azure-eventhubs-starter/src/main/java/org/apache/camel/component/azure/eventhubs/springboot/EventHubsComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,EventHubsComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.azure-eventhubs"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, EventHubsComponentConverter.class})
public class EventHubsComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class EventHubsComponentAutoConfiguration {
public EventHubsComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new EventHubsComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-azure-eventhubs-starter/src/main/java/org/apache/camel/component/azure/eventhubs/springboot/EventHubsComponentConverter.java b/components-starter/camel-azure-eventhubs-starter/src/main/java/org/apache/camel/component/azure/eventhubs/springboot/EventHubsComponentConverter.java
index a99513b..f4e05579 100644
--- a/components-starter/camel-azure-eventhubs-starter/src/main/java/org/apache/camel/component/azure/eventhubs/springboot/EventHubsComponentConverter.java
+++ b/components-starter/camel-azure-eventhubs-starter/src/main/java/org/apache/camel/component/azure/eventhubs/springboot/EventHubsComponentConverter.java
@@ -19,24 +19,25 @@ package org.apache.camel.component.azure.eventhubs.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class EventHubsComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class EventHubsComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public EventHubsComponentConverter(
- org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -61,11 +62,11 @@ public class EventHubsComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "com.azure.core.amqp.AmqpRetryOptions": return camelContext.getRegistry().lookupByNameAndType(ref, com.azure.core.amqp.AmqpRetryOptions.class);
- case "org.apache.camel.component.azure.eventhubs.EventHubsConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.azure.eventhubs.EventHubsConfiguration.class);
- case "com.azure.storage.common.StorageSharedKeyCredential": return camelContext.getRegistry().lookupByNameAndType(ref, com.azure.storage.common.StorageSharedKeyCredential.class);
- case "com.azure.messaging.eventhubs.CheckpointStore": return camelContext.getRegistry().lookupByNameAndType(ref, com.azure.messaging.eventhubs.CheckpointStore.class);
- case "com.azure.messaging.eventhubs.EventHubProducerAsyncClient": return camelContext.getRegistry().lookupByNameAndType(ref, com.azure.messaging.eventhubs.EventHubProducerAsyncClient.class);
+ case "com.azure.core.amqp.AmqpRetryOptions": return applicationContext.getBean(ref, com.azure.core.amqp.AmqpRetryOptions.class);
+ case "org.apache.camel.component.azure.eventhubs.EventHubsConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.azure.eventhubs.EventHubsConfiguration.class);
+ case "com.azure.storage.common.StorageSharedKeyCredential": return applicationContext.getBean(ref, com.azure.storage.common.StorageSharedKeyCredential.class);
+ case "com.azure.messaging.eventhubs.CheckpointStore": return applicationContext.getBean(ref, com.azure.messaging.eventhubs.CheckpointStore.class);
+ case "com.azure.messaging.eventhubs.EventHubProducerAsyncClient": return applicationContext.getBean(ref, com.azure.messaging.eventhubs.EventHubProducerAsyncClient.class);
}
return null;
}
diff --git a/components-starter/camel-azure-eventhubs-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-azure-eventhubs-starter/src/main/resources/META-INF/spring.factories
index b647824..3db5ffc 100644
--- a/components-starter/camel-azure-eventhubs-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-azure-eventhubs-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.azure.eventhubs.springboot.EventHubsComponentAutoConfiguration
+org.apache.camel.component.azure.eventhubs.springboot.EventHubsComponentAutoConfiguration,\
+org.apache.camel.component.azure.eventhubs.springboot.EventHubsComponentConverter
+
diff --git a/components-starter/camel-azure-starter/src/main/java/org/apache/camel/component/azure/blob/springboot/BlobServiceComponentAutoConfiguration.java b/components-starter/camel-azure-starter/src/main/java/org/apache/camel/component/azure/blob/springboot/BlobServiceComponentAutoConfiguration.java
index 7bd2dd6..7599150 100644
--- a/components-starter/camel-azure-starter/src/main/java/org/apache/camel/component/azure/blob/springboot/BlobServiceComponentAutoConfiguration.java
+++ b/components-starter/camel-azure-starter/src/main/java/org/apache/camel/component/azure/blob/springboot/BlobServiceComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,BlobServiceComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.azure-blob"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, BlobServiceComponentConverter.class})
public class BlobServiceComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class BlobServiceComponentAutoConfiguration {
public BlobServiceComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new BlobServiceComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-azure-starter/src/main/java/org/apache/camel/component/azure/blob/springboot/BlobServiceComponentConverter.java b/components-starter/camel-azure-starter/src/main/java/org/apache/camel/component/azure/blob/springboot/BlobServiceComponentConverter.java
index 9a01066..fb1c63a 100644
--- a/components-starter/camel-azure-starter/src/main/java/org/apache/camel/component/azure/blob/springboot/BlobServiceComponentConverter.java
+++ b/components-starter/camel-azure-starter/src/main/java/org/apache/camel/component/azure/blob/springboot/BlobServiceComponentConverter.java
@@ -19,24 +19,25 @@ package org.apache.camel.component.azure.blob.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class BlobServiceComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class BlobServiceComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public BlobServiceComponentConverter(
- org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -59,9 +60,9 @@ public class BlobServiceComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "com.microsoft.azure.storage.blob.CloudBlob": return camelContext.getRegistry().lookupByNameAndType(ref, com.microsoft.azure.storage.blob.CloudBlob.class);
- case "com.microsoft.azure.storage.StorageCredentials": return camelContext.getRegistry().lookupByNameAndType(ref, com.microsoft.azure.storage.StorageCredentials.class);
- case "org.apache.camel.component.azure.blob.BlobServiceConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.azure.blob.BlobServiceConfiguration.class);
+ case "com.microsoft.azure.storage.blob.CloudBlob": return applicationContext.getBean(ref, com.microsoft.azure.storage.blob.CloudBlob.class);
+ case "com.microsoft.azure.storage.StorageCredentials": return applicationContext.getBean(ref, com.microsoft.azure.storage.StorageCredentials.class);
+ case "org.apache.camel.component.azure.blob.BlobServiceConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.azure.blob.BlobServiceConfiguration.class);
}
return null;
}
diff --git a/components-starter/camel-azure-starter/src/main/java/org/apache/camel/component/azure/queue/springboot/QueueServiceComponentAutoConfiguration.java b/components-starter/camel-azure-starter/src/main/java/org/apache/camel/component/azure/queue/springboot/QueueServiceComponentAutoConfiguration.java
index b4948fb..8e76406 100644
--- a/components-starter/camel-azure-starter/src/main/java/org/apache/camel/component/azure/queue/springboot/QueueServiceComponentAutoConfiguration.java
+++ b/components-starter/camel-azure-starter/src/main/java/org/apache/camel/component/azure/queue/springboot/QueueServiceComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,QueueServiceComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.azure-queue"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, QueueServiceComponentConverter.class})
public class QueueServiceComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class QueueServiceComponentAutoConfiguration {
public QueueServiceComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new QueueServiceComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-azure-starter/src/main/java/org/apache/camel/component/azure/queue/springboot/QueueServiceComponentConverter.java b/components-starter/camel-azure-starter/src/main/java/org/apache/camel/component/azure/queue/springboot/QueueServiceComponentConverter.java
index 2aabdf8..a05f9f1 100644
--- a/components-starter/camel-azure-starter/src/main/java/org/apache/camel/component/azure/queue/springboot/QueueServiceComponentConverter.java
+++ b/components-starter/camel-azure-starter/src/main/java/org/apache/camel/component/azure/queue/springboot/QueueServiceComponentConverter.java
@@ -19,24 +19,25 @@ package org.apache.camel.component.azure.queue.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class QueueServiceComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class QueueServiceComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public QueueServiceComponentConverter(
- org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -59,9 +60,9 @@ public class QueueServiceComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "com.microsoft.azure.storage.queue.CloudQueue": return camelContext.getRegistry().lookupByNameAndType(ref, com.microsoft.azure.storage.queue.CloudQueue.class);
- case "com.microsoft.azure.storage.StorageCredentials": return camelContext.getRegistry().lookupByNameAndType(ref, com.microsoft.azure.storage.StorageCredentials.class);
- case "org.apache.camel.component.azure.queue.QueueServiceConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.azure.queue.QueueServiceConfiguration.class);
+ case "com.microsoft.azure.storage.queue.CloudQueue": return applicationContext.getBean(ref, com.microsoft.azure.storage.queue.CloudQueue.class);
+ case "com.microsoft.azure.storage.StorageCredentials": return applicationContext.getBean(ref, com.microsoft.azure.storage.StorageCredentials.class);
+ case "org.apache.camel.component.azure.queue.QueueServiceConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.azure.queue.QueueServiceConfiguration.class);
}
return null;
}
diff --git a/components-starter/camel-azure-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-azure-starter/src/main/resources/META-INF/spring.factories
index 3951b31..fe1d93a 100644
--- a/components-starter/camel-azure-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-azure-starter/src/main/resources/META-INF/spring.factories
@@ -16,5 +16,9 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
org.apache.camel.component.azure.blob.springboot.BlobServiceComponentAutoConfiguration,\
-org.apache.camel.component.azure.queue.springboot.QueueServiceComponentAutoConfiguration
+org.apache.camel.component.azure.queue.springboot.QueueServiceComponentAutoConfiguration,\
+org.apache.camel.component.azure.queue.springboot.QueueServiceComponentConverter,\
+org.apache.camel.component.azure.blob.springboot.BlobServiceComponentConverter
+
+
diff --git a/components-starter/camel-azure-storage-blob-starter/src/main/java/org/apache/camel/component/azure/storage/blob/springboot/BlobComponentAutoConfiguration.java b/components-starter/camel-azure-storage-blob-starter/src/main/java/org/apache/camel/component/azure/storage/blob/springboot/BlobComponentAutoConfiguration.java
index 582fed9..6bff3b2 100644
--- a/components-starter/camel-azure-storage-blob-starter/src/main/java/org/apache/camel/component/azure/storage/blob/springboot/BlobComponentAutoConfiguration.java
+++ b/components-starter/camel-azure-storage-blob-starter/src/main/java/org/apache/camel/component/azure/storage/blob/springboot/BlobComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,BlobComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.azure-storage-blob"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, BlobComponentConverter.class})
public class BlobComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class BlobComponentAutoConfiguration {
public BlobComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new BlobComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-azure-storage-blob-starter/src/main/java/org/apache/camel/component/azure/storage/blob/springboot/BlobComponentConverter.java b/components-starter/camel-azure-storage-blob-starter/src/main/java/org/apache/camel/component/azure/storage/blob/springboot/BlobComponentConverter.java
index 4a9fbdc..d8ae596 100644
--- a/components-starter/camel-azure-storage-blob-starter/src/main/java/org/apache/camel/component/azure/storage/blob/springboot/BlobComponentConverter.java
+++ b/components-starter/camel-azure-storage-blob-starter/src/main/java/org/apache/camel/component/azure/storage/blob/springboot/BlobComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.azure.storage.blob.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class BlobComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class BlobComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public BlobComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -59,10 +61,10 @@ public class BlobComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "org.apache.camel.component.azure.storage.blob.BlobConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.azure.storage.blob.BlobConfiguration.class);
- case "com.azure.storage.common.StorageSharedKeyCredential": return camelContext.getRegistry().lookupByNameAndType(ref, com.azure.storage.common.StorageSharedKeyCredential.class);
- case "com.azure.storage.blob.BlobServiceClient": return camelContext.getRegistry().lookupByNameAndType(ref, com.azure.storage.blob.BlobServiceClient.class);
- case "java.time.Duration": return camelContext.getRegistry().lookupByNameAndType(ref, java.time.Duration.class);
+ case "org.apache.camel.component.azure.storage.blob.BlobConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.azure.storage.blob.BlobConfiguration.class);
+ case "com.azure.storage.common.StorageSharedKeyCredential": return applicationContext.getBean(ref, com.azure.storage.common.StorageSharedKeyCredential.class);
+ case "com.azure.storage.blob.BlobServiceClient": return applicationContext.getBean(ref, com.azure.storage.blob.BlobServiceClient.class);
+ case "java.time.Duration": return applicationContext.getBean(ref, java.time.Duration.class);
}
return null;
}
diff --git a/components-starter/camel-azure-storage-blob-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-azure-storage-blob-starter/src/main/resources/META-INF/spring.factories
index 4352770..1c85de2 100644
--- a/components-starter/camel-azure-storage-blob-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-azure-storage-blob-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.azure.storage.blob.springboot.BlobComponentAutoConfiguration
+org.apache.camel.component.azure.storage.blob.springboot.BlobComponentAutoConfiguration,\
+org.apache.camel.component.azure.storage.blob.springboot.BlobComponentConverter
+
diff --git a/components-starter/camel-azure-storage-queue-starter/src/main/java/org/apache/camel/component/azure/storage/queue/springboot/QueueComponentAutoConfiguration.java b/components-starter/camel-azure-storage-queue-starter/src/main/java/org/apache/camel/component/azure/storage/queue/springboot/QueueComponentAutoConfiguration.java
index 32070f1..4ffd6f3 100644
--- a/components-starter/camel-azure-storage-queue-starter/src/main/java/org/apache/camel/component/azure/storage/queue/springboot/QueueComponentAutoConfiguration.java
+++ b/components-starter/camel-azure-storage-queue-starter/src/main/java/org/apache/camel/component/azure/storage/queue/springboot/QueueComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,QueueComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.azure-storage-queue"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, QueueComponentConverter.class})
public class QueueComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class QueueComponentAutoConfiguration {
public QueueComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new QueueComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-azure-storage-queue-starter/src/main/java/org/apache/camel/component/azure/storage/queue/springboot/QueueComponentConverter.java b/components-starter/camel-azure-storage-queue-starter/src/main/java/org/apache/camel/component/azure/storage/queue/springboot/QueueComponentConverter.java
index e0ce01f..0ebff4e 100644
--- a/components-starter/camel-azure-storage-queue-starter/src/main/java/org/apache/camel/component/azure/storage/queue/springboot/QueueComponentConverter.java
+++ b/components-starter/camel-azure-storage-queue-starter/src/main/java/org/apache/camel/component/azure/storage/queue/springboot/QueueComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.azure.storage.queue.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class QueueComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class QueueComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public QueueComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -59,10 +61,10 @@ public class QueueComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "org.apache.camel.component.azure.storage.queue.QueueConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.azure.storage.queue.QueueConfiguration.class);
- case "com.azure.storage.queue.QueueServiceClient": return camelContext.getRegistry().lookupByNameAndType(ref, com.azure.storage.queue.QueueServiceClient.class);
- case "java.time.Duration": return camelContext.getRegistry().lookupByNameAndType(ref, java.time.Duration.class);
- case "com.azure.storage.common.StorageSharedKeyCredential": return camelContext.getRegistry().lookupByNameAndType(ref, com.azure.storage.common.StorageSharedKeyCredential.class);
+ case "org.apache.camel.component.azure.storage.queue.QueueConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.azure.storage.queue.QueueConfiguration.class);
+ case "com.azure.storage.queue.QueueServiceClient": return applicationContext.getBean(ref, com.azure.storage.queue.QueueServiceClient.class);
+ case "java.time.Duration": return applicationContext.getBean(ref, java.time.Duration.class);
+ case "com.azure.storage.common.StorageSharedKeyCredential": return applicationContext.getBean(ref, com.azure.storage.common.StorageSharedKeyCredential.class);
}
return null;
}
diff --git a/components-starter/camel-azure-storage-queue-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-azure-storage-queue-starter/src/main/resources/META-INF/spring.factories
index 74e6d96..397f141 100644
--- a/components-starter/camel-azure-storage-queue-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-azure-storage-queue-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.azure.storage.queue.springboot.QueueComponentAutoConfiguration
+org.apache.camel.component.azure.storage.queue.springboot.QueueComponentAutoConfiguration,\
+org.apache.camel.component.azure.storage.queue.springboot.QueueComponentConverter
+
diff --git a/components-starter/camel-bean-starter/src/main/java/org/apache/camel/component/bean/springboot/BeanComponentAutoConfiguration.java b/components-starter/camel-bean-starter/src/main/java/org/apache/camel/component/bean/springboot/BeanComponentAutoConfiguration.java
index 23e40f1..8741b8d 100644
--- a/components-starter/camel-bean-starter/src/main/java/org/apache/camel/component/bean/springboot/BeanComponentAutoConfiguration.java
+++ b/components-starter/camel-bean-starter/src/main/java/org/apache/camel/component/bean/springboot/BeanComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,BeanComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.bean"})
+@AutoConfigureAfter(CamelAutoConfiguration.class)
public class BeanComponentAutoConfiguration {
@Autowired
diff --git a/components-starter/camel-bean-starter/src/main/java/org/apache/camel/component/beanclass/springboot/ClassComponentAutoConfiguration.java b/components-starter/camel-bean-starter/src/main/java/org/apache/camel/component/beanclass/springboot/ClassComponentAutoConfiguration.java
index c997771..a98921c 100644
--- a/components-starter/camel-bean-starter/src/main/java/org/apache/camel/component/beanclass/springboot/ClassComponentAutoConfiguration.java
+++ b/components-starter/camel-bean-starter/src/main/java/org/apache/camel/component/beanclass/springboot/ClassComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,ClassComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.class"})
+@AutoConfigureAfter(CamelAutoConfiguration.class)
public class ClassComponentAutoConfiguration {
@Autowired
diff --git a/components-starter/camel-bean-validator-starter/src/main/java/org/apache/camel/component/bean/validator/springboot/BeanValidatorComponentAutoConfiguration.java b/components-starter/camel-bean-validator-starter/src/main/java/org/apache/camel/component/bean/validator/springboot/BeanValidatorComponentAutoConfiguration.java
index 2779ae6..a15be9b 100644
--- a/components-starter/camel-bean-validator-starter/src/main/java/org/apache/camel/component/bean/validator/springboot/BeanValidatorComponentAutoConfiguration.java
+++ b/components-starter/camel-bean-validator-starter/src/main/java/org/apache/camel/component/bean/validator/springboot/BeanValidatorComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,BeanValidatorComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.bean-validator"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, BeanValidatorComponentConverter.class})
public class BeanValidatorComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class BeanValidatorComponentAutoConfiguration {
public BeanValidatorComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new BeanValidatorComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-bean-validator-starter/src/main/java/org/apache/camel/component/bean/validator/springboot/BeanValidatorComponentConverter.java b/components-starter/camel-bean-validator-starter/src/main/java/org/apache/camel/component/bean/validator/springboot/BeanValidatorComponentConverter.java
index b5fb9f7..8942954 100644
--- a/components-starter/camel-bean-validator-starter/src/main/java/org/apache/camel/component/bean/validator/springboot/BeanValidatorComponentConverter.java
+++ b/components-starter/camel-bean-validator-starter/src/main/java/org/apache/camel/component/bean/validator/springboot/BeanValidatorComponentConverter.java
@@ -19,24 +19,25 @@ package org.apache.camel.component.bean.validator.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class BeanValidatorComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class BeanValidatorComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public BeanValidatorComponentConverter(
- org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -61,11 +62,11 @@ public class BeanValidatorComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "javax.validation.ConstraintValidatorFactory": return camelContext.getRegistry().lookupByNameAndType(ref, javax.validation.ConstraintValidatorFactory.class);
- case "javax.validation.MessageInterpolator": return camelContext.getRegistry().lookupByNameAndType(ref, javax.validation.MessageInterpolator.class);
- case "javax.validation.TraversableResolver": return camelContext.getRegistry().lookupByNameAndType(ref, javax.validation.TraversableResolver.class);
- case "javax.validation.ValidationProviderResolver": return camelContext.getRegistry().lookupByNameAndType(ref, javax.validation.ValidationProviderResolver.class);
- case "javax.validation.ValidatorFactory": return camelContext.getRegistry().lookupByNameAndType(ref, javax.validation.ValidatorFactory.class);
+ case "javax.validation.ConstraintValidatorFactory": return applicationContext.getBean(ref, javax.validation.ConstraintValidatorFactory.class);
+ case "javax.validation.MessageInterpolator": return applicationContext.getBean(ref, javax.validation.MessageInterpolator.class);
+ case "javax.validation.TraversableResolver": return applicationContext.getBean(ref, javax.validation.TraversableResolver.class);
+ case "javax.validation.ValidationProviderResolver": return applicationContext.getBean(ref, javax.validation.ValidationProviderResolver.class);
+ case "javax.validation.ValidatorFactory": return applicationContext.getBean(ref, javax.validation.ValidatorFactory.class);
}
return null;
}
diff --git a/components-starter/camel-bean-validator-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-bean-validator-starter/src/main/resources/META-INF/spring.factories
index 0b82ed8..4b48050 100644
--- a/components-starter/camel-bean-validator-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-bean-validator-starter/src/main/resources/META-INF/spring.factories
@@ -15,4 +15,6 @@
## limitations under the License.
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.bean.validator.springboot.BeanValidatorComponentAutoConfiguration
+org.apache.camel.component.bean.validator.springboot.BeanValidatorComponentAutoConfiguration,\
+org.apache.camel.component.bean.validator.springboot.BeanValidatorComponentConverter
+
diff --git a/components-starter/camel-beanstalk-starter/src/main/java/org/apache/camel/component/beanstalk/springboot/BeanstalkComponentAutoConfiguration.java b/components-starter/camel-beanstalk-starter/src/main/java/org/apache/camel/component/beanstalk/springboot/BeanstalkComponentAutoConfiguration.java
index fc68def..6a467cd 100644
--- a/components-starter/camel-beanstalk-starter/src/main/java/org/apache/camel/component/beanstalk/springboot/BeanstalkComponentAutoConfiguration.java
+++ b/components-starter/camel-beanstalk-starter/src/main/java/org/apache/camel/component/beanstalk/springboot/BeanstalkComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,BeanstalkComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.beanstalk"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, BeanstalkComponentConverter.class})
public class BeanstalkComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class BeanstalkComponentAutoConfiguration {
public BeanstalkComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new BeanstalkComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-beanstalk-starter/src/main/java/org/apache/camel/component/beanstalk/springboot/BeanstalkComponentConverter.java b/components-starter/camel-beanstalk-starter/src/main/java/org/apache/camel/component/beanstalk/springboot/BeanstalkComponentConverter.java
index e8ab21b..e016972 100644
--- a/components-starter/camel-beanstalk-starter/src/main/java/org/apache/camel/component/beanstalk/springboot/BeanstalkComponentConverter.java
+++ b/components-starter/camel-beanstalk-starter/src/main/java/org/apache/camel/component/beanstalk/springboot/BeanstalkComponentConverter.java
@@ -19,24 +19,25 @@ package org.apache.camel.component.beanstalk.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class BeanstalkComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class BeanstalkComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public BeanstalkComponentConverter(
- org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -57,7 +58,7 @@ public class BeanstalkComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "org.apache.camel.component.beanstalk.ConnectionSettingsFactory": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.beanstalk.ConnectionSettingsFactory.class);
+ case "org.apache.camel.component.beanstalk.ConnectionSettingsFactory": return applicationContext.getBean(ref, org.apache.camel.component.beanstalk.ConnectionSettingsFactory.class);
}
return null;
}
diff --git a/components-starter/camel-beanstalk-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-beanstalk-starter/src/main/resources/META-INF/spring.factories
index 1901d85..504e7dc 100644
--- a/components-starter/camel-beanstalk-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-beanstalk-starter/src/main/resources/META-INF/spring.factories
@@ -15,4 +15,6 @@
## limitations under the License.
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.beanstalk.springboot.BeanstalkComponentAutoConfiguration
+org.apache.camel.component.beanstalk.springboot.BeanstalkComponentAutoConfiguration,\
+org.apache.camel.component.beanstalk.springboot.BeanstalkComponentConverter
+
diff --git a/components-starter/camel-bonita-starter/src/main/java/org/apache/camel/component/bonita/springboot/BonitaComponentAutoConfiguration.java b/components-starter/camel-bonita-starter/src/main/java/org/apache/camel/component/bonita/springboot/BonitaComponentAutoConfiguration.java
index 19387b4..1cebfb2 100644
--- a/components-starter/camel-bonita-starter/src/main/java/org/apache/camel/component/bonita/springboot/BonitaComponentAutoConfiguration.java
+++ b/components-starter/camel-bonita-starter/src/main/java/org/apache/camel/component/bonita/springboot/BonitaComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,BonitaComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.bonita"})
+@AutoConfigureAfter(CamelAutoConfiguration.class)
public class BonitaComponentAutoConfiguration {
@Autowired
diff --git a/components-starter/camel-box-starter/src/main/java/org/apache/camel/component/box/springboot/BoxComponentAutoConfiguration.java b/components-starter/camel-box-starter/src/main/java/org/apache/camel/component/box/springboot/BoxComponentAutoConfiguration.java
index 0f5683a..7a42f00 100644
--- a/components-starter/camel-box-starter/src/main/java/org/apache/camel/component/box/springboot/BoxComponentAutoConfiguration.java
+++ b/components-starter/camel-box-starter/src/main/java/org/apache/camel/component/box/springboot/BoxComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,BoxComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.box"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, BoxComponentConverter.class})
public class BoxComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class BoxComponentAutoConfiguration {
public BoxComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new BoxComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-box-starter/src/main/java/org/apache/camel/component/box/springboot/BoxComponentConverter.java b/components-starter/camel-box-starter/src/main/java/org/apache/camel/component/box/springboot/BoxComponentConverter.java
index 5995b12..99a8fc3 100644
--- a/components-starter/camel-box-starter/src/main/java/org/apache/camel/component/box/springboot/BoxComponentConverter.java
+++ b/components-starter/camel-box-starter/src/main/java/org/apache/camel/component/box/springboot/BoxComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.box.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class BoxComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class BoxComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public BoxComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -58,9 +60,9 @@ public class BoxComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "org.apache.camel.component.box.BoxConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.box.BoxConfiguration.class);
- case "com.box.sdk.IAccessTokenCache": return camelContext.getRegistry().lookupByNameAndType(ref, com.box.sdk.IAccessTokenCache.class);
- case "org.apache.camel.support.jsse.SSLContextParameters": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.support.jsse.SSLContextParameters.class);
+ case "org.apache.camel.component.box.BoxConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.box.BoxConfiguration.class);
+ case "com.box.sdk.IAccessTokenCache": return applicationContext.getBean(ref, com.box.sdk.IAccessTokenCache.class);
+ case "org.apache.camel.support.jsse.SSLContextParameters": return applicationContext.getBean(ref, org.apache.camel.support.jsse.SSLContextParameters.class);
}
return null;
}
diff --git a/components-starter/camel-box-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-box-starter/src/main/resources/META-INF/spring.factories
index 86795fc..0e98d76 100644
--- a/components-starter/camel-box-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-box-starter/src/main/resources/META-INF/spring.factories
@@ -15,4 +15,6 @@
## limitations under the License.
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.box.springboot.BoxComponentAutoConfiguration
+org.apache.camel.component.box.springboot.BoxComponentAutoConfiguration,\
+org.apache.camel.component.box.springboot.BoxComponentConverter
+
diff --git a/components-starter/camel-braintree-starter/src/main/java/org/apache/camel/component/braintree/springboot/BraintreeComponentAutoConfiguration.java b/components-starter/camel-braintree-starter/src/main/java/org/apache/camel/component/braintree/springboot/BraintreeComponentAutoConfiguration.java
index 9ae8b64..236107f 100644
--- a/components-starter/camel-braintree-starter/src/main/java/org/apache/camel/component/braintree/springboot/BraintreeComponentAutoConfiguration.java
+++ b/components-starter/camel-braintree-starter/src/main/java/org/apache/camel/component/braintree/springboot/BraintreeComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,BraintreeComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.braintree"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, BraintreeComponentConverter.class})
public class BraintreeComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class BraintreeComponentAutoConfiguration {
public BraintreeComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new BraintreeComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-braintree-starter/src/main/java/org/apache/camel/component/braintree/springboot/BraintreeComponentConverter.java b/components-starter/camel-braintree-starter/src/main/java/org/apache/camel/component/braintree/springboot/BraintreeComponentConverter.java
index f0d2c97..36613a6 100644
--- a/components-starter/camel-braintree-starter/src/main/java/org/apache/camel/component/braintree/springboot/BraintreeComponentConverter.java
+++ b/components-starter/camel-braintree-starter/src/main/java/org/apache/camel/component/braintree/springboot/BraintreeComponentConverter.java
@@ -19,24 +19,25 @@ package org.apache.camel.component.braintree.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class BraintreeComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class BraintreeComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public BraintreeComponentConverter(
- org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -57,7 +58,7 @@ public class BraintreeComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "org.apache.camel.component.braintree.BraintreeConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.braintree.BraintreeConfiguration.class);
+ case "org.apache.camel.component.braintree.BraintreeConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.braintree.BraintreeConfiguration.class);
}
return null;
}
diff --git a/components-starter/camel-braintree-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-braintree-starter/src/main/resources/META-INF/spring.factories
index ec522ff..282f168 100644
--- a/components-starter/camel-braintree-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-braintree-starter/src/main/resources/META-INF/spring.factories
@@ -15,4 +15,6 @@
## limitations under the License.
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.braintree.springboot.BraintreeComponentAutoConfiguration
+org.apache.camel.component.braintree.springboot.BraintreeComponentAutoConfiguration,\
+org.apache.camel.component.braintree.springboot.BraintreeComponentConverter
+
diff --git a/components-starter/camel-browse-starter/src/main/java/org/apache/camel/component/browse/springboot/BrowseComponentAutoConfiguration.java b/components-starter/camel-browse-starter/src/main/java/org/apache/camel/component/browse/springboot/BrowseComponentAutoConfiguration.java
index 6971408..526e556 100644
--- a/components-starter/camel-browse-starter/src/main/java/org/apache/camel/component/browse/springboot/BrowseComponentAutoConfiguration.java
+++ b/components-starter/camel-browse-starter/src/main/java/org/apache/camel/component/browse/springboot/BrowseComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,BrowseComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.browse"})
+@AutoConfigureAfter(CamelAutoConfiguration.class)
public class BrowseComponentAutoConfiguration {
@Autowired
diff --git a/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/cache/springboot/CaffeineCacheComponentAutoConfiguration.java b/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/cache/springboot/CaffeineCacheComponentAutoConfiguration.java
index 7a125e7..5aaade4 100644
--- a/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/cache/springboot/CaffeineCacheComponentAutoConfiguration.java
+++ b/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/cache/springboot/CaffeineCacheComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,CaffeineCacheComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.caffeine-cache"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, CaffeineCacheComponentConverter.class})
public class CaffeineCacheComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class CaffeineCacheComponentAutoConfiguration {
public CaffeineCacheComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new CaffeineCacheComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/cache/springboot/CaffeineCacheComponentConverter.java b/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/cache/springboot/CaffeineCacheComponentConverter.java
index 68e2697..ce4462d 100644
--- a/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/cache/springboot/CaffeineCacheComponentConverter.java
+++ b/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/cache/springboot/CaffeineCacheComponentConverter.java
@@ -19,24 +19,25 @@ package org.apache.camel.component.caffeine.cache.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class CaffeineCacheComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class CaffeineCacheComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public CaffeineCacheComponentConverter(
- org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -60,10 +61,10 @@ public class CaffeineCacheComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "com.github.benmanes.caffeine.cache.CacheLoader": return camelContext.getRegistry().lookupByNameAndType(ref, com.github.benmanes.caffeine.cache.CacheLoader.class);
- case "com.github.benmanes.caffeine.cache.RemovalListener": return camelContext.getRegistry().lookupByNameAndType(ref, com.github.benmanes.caffeine.cache.RemovalListener.class);
- case "com.github.benmanes.caffeine.cache.stats.StatsCounter": return camelContext.getRegistry().lookupByNameAndType(ref, com.github.benmanes.caffeine.cache.stats.StatsCounter.class);
- case "org.apache.camel.component.caffeine.CaffeineConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.caffeine.CaffeineConfiguration.class);
+ case "com.github.benmanes.caffeine.cache.CacheLoader": return applicationContext.getBean(ref, com.github.benmanes.caffeine.cache.CacheLoader.class);
+ case "com.github.benmanes.caffeine.cache.RemovalListener": return applicationContext.getBean(ref, com.github.benmanes.caffeine.cache.RemovalListener.class);
+ case "com.github.benmanes.caffeine.cache.stats.StatsCounter": return applicationContext.getBean(ref, com.github.benmanes.caffeine.cache.stats.StatsCounter.class);
+ case "org.apache.camel.component.caffeine.CaffeineConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.caffeine.CaffeineConfiguration.class);
}
return null;
}
diff --git a/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/load/springboot/CaffeineLoadCacheComponentAutoConfiguration.java b/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/load/springboot/CaffeineLoadCacheComponentAutoConfiguration.java
index 091a70f..af78acb 100644
--- a/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/load/springboot/CaffeineLoadCacheComponentAutoConfiguration.java
+++ b/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/load/springboot/CaffeineLoadCacheComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,CaffeineLoadCacheComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.caffeine-loadcache"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, CaffeineLoadCacheComponentConverter.class})
public class CaffeineLoadCacheComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class CaffeineLoadCacheComponentAutoConfiguration {
public CaffeineLoadCacheComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new CaffeineLoadCacheComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/load/springboot/CaffeineLoadCacheComponentConverter.java b/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/load/springboot/CaffeineLoadCacheComponentConverter.java
index d1b2e36..7ff6ba8 100644
--- a/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/load/springboot/CaffeineLoadCacheComponentConverter.java
+++ b/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/load/springboot/CaffeineLoadCacheComponentConverter.java
@@ -19,24 +19,25 @@ package org.apache.camel.component.caffeine.load.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class CaffeineLoadCacheComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class CaffeineLoadCacheComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public CaffeineLoadCacheComponentConverter(
- org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -60,10 +61,10 @@ public class CaffeineLoadCacheComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "com.github.benmanes.caffeine.cache.CacheLoader": return camelContext.getRegistry().lookupByNameAndType(ref, com.github.benmanes.caffeine.cache.CacheLoader.class);
- case "com.github.benmanes.caffeine.cache.RemovalListener": return camelContext.getRegistry().lookupByNameAndType(ref, com.github.benmanes.caffeine.cache.RemovalListener.class);
- case "com.github.benmanes.caffeine.cache.stats.StatsCounter": return camelContext.getRegistry().lookupByNameAndType(ref, com.github.benmanes.caffeine.cache.stats.StatsCounter.class);
- case "org.apache.camel.component.caffeine.CaffeineConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.caffeine.CaffeineConfiguration.class);
+ case "com.github.benmanes.caffeine.cache.CacheLoader": return applicationContext.getBean(ref, com.github.benmanes.caffeine.cache.CacheLoader.class);
+ case "com.github.benmanes.caffeine.cache.RemovalListener": return applicationContext.getBean(ref, com.github.benmanes.caffeine.cache.RemovalListener.class);
+ case "com.github.benmanes.caffeine.cache.stats.StatsCounter": return applicationContext.getBean(ref, com.github.benmanes.caffeine.cache.stats.StatsCounter.class);
+ case "org.apache.camel.component.caffeine.CaffeineConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.caffeine.CaffeineConfiguration.class);
}
return null;
}
diff --git a/components-starter/camel-caffeine-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-caffeine-starter/src/main/resources/META-INF/spring.factories
index eb43fa6..8cb4d9a 100644
--- a/components-starter/camel-caffeine-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-caffeine-starter/src/main/resources/META-INF/spring.factories
@@ -17,5 +17,9 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
org.apache.camel.component.caffeine.load.springboot.CaffeineLoadCacheComponentAutoConfiguration,\
-org.apache.camel.component.caffeine.cache.springboot.CaffeineCacheComponentAutoConfiguration
+org.apache.camel.component.caffeine.cache.springboot.CaffeineCacheComponentAutoConfiguration,\
+org.apache.camel.component.caffeine.load.springboot.CaffeineLoadCacheComponentConverter,\
+org.apache.camel.component.caffeine.cache.springboot.CaffeineCacheComponentConverter
+
+
diff --git a/components-starter/camel-cassandraql-starter/src/main/java/org/apache/camel/component/cassandra/springboot/CassandraComponentAutoConfiguration.java b/components-starter/camel-cassandraql-starter/src/main/java/org/apache/camel/component/cassandra/springboot/CassandraComponentAutoConfiguration.java
index 2d8f6c2..59f5b20 100644
--- a/components-starter/camel-cassandraql-starter/src/main/java/org/apache/camel/component/cassandra/springboot/CassandraComponentAutoConfiguration.java
+++ b/components-starter/camel-cassandraql-starter/src/main/java/org/apache/camel/component/cassandra/springboot/CassandraComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,CassandraComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.cql"})
+@AutoConfigureAfter(CamelAutoConfiguration.class)
public class CassandraComponentAutoConfiguration {
@Autowired
diff --git a/components-starter/camel-chatscript-starter/src/main/java/org/apache/camel/component/chatscript/springboot/ChatScriptComponentAutoConfiguration.java b/components-starter/camel-chatscript-starter/src/main/java/org/apache/camel/component/chatscript/springboot/ChatScriptComponentAutoConfiguration.java
index cbbc482..055dee7 100644
--- a/components-starter/camel-chatscript-starter/src/main/java/org/apache/camel/component/chatscript/springboot/ChatScriptComponentAutoConfiguration.java
+++ b/components-starter/camel-chatscript-starter/src/main/java/org/apache/camel/component/chatscript/springboot/ChatScriptComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,ChatScriptComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.chatscript"})
+@AutoConfigureAfter(CamelAutoConfiguration.class)
public class ChatScriptComponentAutoConfiguration {
@Autowired
diff --git a/components-starter/camel-chunk-starter/src/main/java/org/apache/camel/component/chunk/springboot/ChunkComponentAutoConfiguration.java b/components-starter/camel-chunk-starter/src/main/java/org/apache/camel/component/chunk/springboot/ChunkComponentAutoConfiguration.java
index 935f9c6..1d7a363 100644
--- a/components-starter/camel-chunk-starter/src/main/java/org/apache/camel/component/chunk/springboot/ChunkComponentAutoConfiguration.java
+++ b/components-starter/camel-chunk-starter/src/main/java/org/apache/camel/component/chunk/springboot/ChunkComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,ChunkComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.chunk"})
+@AutoConfigureAfter(CamelAutoConfiguration.class)
public class ChunkComponentAutoConfiguration {
@Autowired
diff --git a/components-starter/camel-cm-sms-starter/src/main/java/org/apache/camel/component/cm/springboot/CMComponentAutoConfiguration.java b/components-starter/camel-cm-sms-starter/src/main/java/org/apache/camel/component/cm/springboot/CMComponentAutoConfiguration.java
index 1ce7809..bbeb595 100644
--- a/components-starter/camel-cm-sms-starter/src/main/java/org/apache/camel/component/cm/springboot/CMComponentAutoConfiguration.java
+++ b/components-starter/camel-cm-sms-starter/src/main/java/org/apache/camel/component/cm/springboot/CMComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,CMComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.cm-sms"})
+@AutoConfigureAfter(CamelAutoConfiguration.class)
public class CMComponentAutoConfiguration {
@Autowired
diff --git a/components-starter/camel-cmis-starter/src/main/java/org/apache/camel/component/cmis/springboot/CMISComponentAutoConfiguration.java b/components-starter/camel-cmis-starter/src/main/java/org/apache/camel/component/cmis/springboot/CMISComponentAutoConfiguration.java
index df12db8..8bd611f 100644
--- a/components-starter/camel-cmis-starter/src/main/java/org/apache/camel/component/cmis/springboot/CMISComponentAutoConfiguration.java
+++ b/components-starter/camel-cmis-starter/src/main/java/org/apache/camel/component/cmis/springboot/CMISComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,CMISComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.cmis"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, CMISComponentConverter.class})
public class CMISComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class CMISComponentAutoConfiguration {
public CMISComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new CMISComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-cmis-starter/src/main/java/org/apache/camel/component/cmis/springboot/CMISComponentConverter.java b/components-starter/camel-cmis-starter/src/main/java/org/apache/camel/component/cmis/springboot/CMISComponentConverter.java
index 9e7c72c..581bc33 100644
--- a/components-starter/camel-cmis-starter/src/main/java/org/apache/camel/component/cmis/springboot/CMISComponentConverter.java
+++ b/components-starter/camel-cmis-starter/src/main/java/org/apache/camel/component/cmis/springboot/CMISComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.cmis.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class CMISComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class CMISComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public CMISComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -56,7 +58,7 @@ public class CMISComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "org.apache.camel.component.cmis.CMISSessionFacadeFactory": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.cmis.CMISSessionFacadeFactory.class);
+ case "org.apache.camel.component.cmis.CMISSessionFacadeFactory": return applicationContext.getBean(ref, org.apache.camel.component.cmis.CMISSessionFacadeFactory.class);
}
return null;
}
diff --git a/components-starter/camel-cmis-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-cmis-starter/src/main/resources/META-INF/spring.factories
index aca805b..f33553a 100644
--- a/components-starter/camel-cmis-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-cmis-starter/src/main/resources/META-INF/spring.factories
@@ -15,4 +15,6 @@
## limitations under the License.
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.cmis.springboot.CMISComponentAutoConfiguration
+org.apache.camel.component.cmis.springboot.CMISComponentAutoConfiguration,\
+org.apache.camel.component.cmis.springboot.CMISComponentConverter
+
diff --git a/components-starter/camel-coap-starter/src/main/java/org/apache/camel/coap/springboot/CoAPComponentAutoConfiguration.java b/components-starter/camel-coap-starter/src/main/java/org/apache/camel/coap/springboot/CoAPComponentAutoConfiguration.java
index 55b24b7..c806f42 100644
--- a/components-starter/camel-coap-starter/src/main/java/org/apache/camel/coap/springboot/CoAPComponentAutoConfiguration.java
+++ b/components-starter/camel-coap-starter/src/main/java/org/apache/camel/coap/springboot/CoAPComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,CoAPComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.coap"})
+@AutoConfigureAfter(CamelAutoConfiguration.class)
public class CoAPComponentAutoConfiguration {
@Autowired
diff --git a/components-starter/camel-cometd-starter/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentAutoConfiguration.java b/components-starter/camel-cometd-starter/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentAutoConfiguration.java
index 34e6384..bb9a439 100644
--- a/components-starter/camel-cometd-starter/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentAutoConfiguration.java
+++ b/components-starter/camel-cometd-starter/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,CometdComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.cometd"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, CometdComponentConverter.class})
public class CometdComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class CometdComponentAutoConfiguration {
public CometdComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new CometdComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-cometd-starter/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentConverter.java b/components-starter/camel-cometd-starter/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentConverter.java
index 0876366..45f2cae 100644
--- a/components-starter/camel-cometd-starter/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentConverter.java
+++ b/components-starter/camel-cometd-starter/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.cometd.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class CometdComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class CometdComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public CometdComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -57,8 +59,8 @@ public class CometdComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "org.cometd.bayeux.server.SecurityPolicy": return camelContext.getRegistry().lookupByNameAndType(ref, org.cometd.bayeux.server.SecurityPolicy.class);
- case "org.apache.camel.support.jsse.SSLContextParameters": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.support.jsse.SSLContextParameters.class);
+ case "org.cometd.bayeux.server.SecurityPolicy": return applicationContext.getBean(ref, org.cometd.bayeux.server.SecurityPolicy.class);
+ case "org.apache.camel.support.jsse.SSLContextParameters": return applicationContext.getBean(ref, org.apache.camel.support.jsse.SSLContextParameters.class);
}
return null;
}
diff --git a/components-starter/camel-cometd-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-cometd-starter/src/main/resources/META-INF/spring.factories
index f46bd2e..8a716ac 100644
--- a/components-starter/camel-cometd-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-cometd-starter/src/main/resources/META-INF/spring.factories
@@ -15,4 +15,6 @@
## limitations under the License.
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.cometd.springboot.CometdComponentAutoConfiguration
+org.apache.camel.component.cometd.springboot.CometdComponentAutoConfiguration,\
+org.apache.camel.component.cometd.springboot.CometdComponentConverter
+
diff --git a/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/ConsulComponentAutoConfiguration.java b/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/ConsulComponentAutoConfiguration.java
index 2548afb..1e8b03d 100644
--- a/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/ConsulComponentAutoConfiguration.java
+++ b/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/ConsulComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,ConsulComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.consul"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, ConsulComponentConverter.class})
public class ConsulComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class ConsulComponentAutoConfiguration {
public ConsulComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new ConsulComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/ConsulComponentConverter.java b/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/ConsulComponentConverter.java
index d434654..7d91d50 100644
--- a/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/ConsulComponentConverter.java
+++ b/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/ConsulComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.consul.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class ConsulComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class ConsulComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public ConsulComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -60,11 +62,11 @@ public class ConsulComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "java.time.Duration": return camelContext.getRegistry().lookupByNameAndType(ref, java.time.Duration.class);
- case "com.orbitz.consul.Consul": return camelContext.getRegistry().lookupByNameAndType(ref, com.orbitz.consul.Consul.class);
- case "org.apache.camel.component.consul.ConsulConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.consul.ConsulConfiguration.class);
- case "org.apache.camel.support.jsse.SSLContextParameters": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.support.jsse.SSLContextParameters.class);
- case "java.math.BigInteger": return camelContext.getRegistry().lookupByNameAndType(ref, java.math.BigInteger.class);
+ case "java.time.Duration": return applicationContext.getBean(ref, java.time.Duration.class);
+ case "com.orbitz.consul.Consul": return applicationContext.getBean(ref, com.orbitz.consul.Consul.class);
+ case "org.apache.camel.component.consul.ConsulConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.consul.ConsulConfiguration.class);
+ case "org.apache.camel.support.jsse.SSLContextParameters": return applicationContext.getBean(ref, org.apache.camel.support.jsse.SSLContextParameters.class);
+ case "java.math.BigInteger": return applicationContext.getBean(ref, java.math.BigInteger.class);
}
return null;
}
diff --git a/components-starter/camel-consul-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-consul-starter/src/main/resources/META-INF/spring.factories
index 801b6f5..7800359 100644
--- a/components-starter/camel-consul-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-consul-starter/src/main/resources/META-INF/spring.factories
@@ -18,4 +18,6 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
org.apache.camel.component.consul.springboot.ConsulComponentAutoConfiguration,\
org.apache.camel.component.consul.springboot.cloud.ConsulServiceDiscoveryAutoConfiguration,\
org.apache.camel.component.consul.springboot.cloud.ConsulServiceRegistryAutoConfiguration,\
- org.apache.camel.component.consul.springboot.cluster.ConsulClusterServiceAutoConfiguration
+ org.apache.camel.component.consul.springboot.cluster.ConsulClusterServiceAutoConfiguration,\
+org.apache.camel.component.consul.springboot.ConsulComponentConverter
+
diff --git a/components-starter/camel-controlbus-starter/src/main/java/org/apache/camel/component/controlbus/springboot/ControlBusComponentAutoConfiguration.java b/components-starter/camel-controlbus-starter/src/main/java/org/apache/camel/component/controlbus/springboot/ControlBusComponentAutoConfiguration.java
index 4261684..abc274e 100644
--- a/components-starter/camel-controlbus-starter/src/main/java/org/apache/camel/component/controlbus/springboot/ControlBusComponentAutoConfiguration.java
+++ b/components-starter/camel-controlbus-starter/src/main/java/org/apache/camel/component/controlbus/springboot/ControlBusComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,ControlBusComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.controlbus"})
+@AutoConfigureAfter(CamelAutoConfiguration.class)
public class ControlBusComponentAutoConfiguration {
@Autowired
diff --git a/components-starter/camel-corda-starter/src/main/java/org/apache/camel/component/corda/springboot/CordaComponentAutoConfiguration.java b/components-starter/camel-corda-starter/src/main/java/org/apache/camel/component/corda/springboot/CordaComponentAutoConfiguration.java
index 66558b6..7497849 100644
--- a/components-starter/camel-corda-starter/src/main/java/org/apache/camel/component/corda/springboot/CordaComponentAutoConfiguration.java
+++ b/components-starter/camel-corda-starter/src/main/java/org/apache/camel/component/corda/springboot/CordaComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,CordaComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.corda"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, CordaComponentConverter.class})
public class CordaComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class CordaComponentAutoConfiguration {
public CordaComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new CordaComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-corda-starter/src/main/java/org/apache/camel/component/corda/springboot/CordaComponentConverter.java b/components-starter/camel-corda-starter/src/main/java/org/apache/camel/component/corda/springboot/CordaComponentConverter.java
index 945c018..7528235 100644
--- a/components-starter/camel-corda-starter/src/main/java/org/apache/camel/component/corda/springboot/CordaComponentConverter.java
+++ b/components-starter/camel-corda-starter/src/main/java/org/apache/camel/component/corda/springboot/CordaComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.corda.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class CordaComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class CordaComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public CordaComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -58,9 +60,9 @@ public class CordaComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "org.apache.camel.component.corda.CordaConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.corda.CordaConfiguration.class);
- case "net.corda.core.node.services.vault.PageSpecification": return camelContext.getRegistry().lookupByNameAndType(ref, net.corda.core.node.services.vault.PageSpecification.class);
- case "net.corda.core.node.services.vault.QueryCriteria": return camelContext.getRegistry().lookupByNameAndType(ref, net.corda.core.node.services.vault.QueryCriteria.class);
+ case "org.apache.camel.component.corda.CordaConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.corda.CordaConfiguration.class);
+ case "net.corda.core.node.services.vault.PageSpecification": return applicationContext.getBean(ref, net.corda.core.node.services.vault.PageSpecification.class);
+ case "net.corda.core.node.services.vault.QueryCriteria": return applicationContext.getBean(ref, net.corda.core.node.services.vault.QueryCriteria.class);
}
return null;
}
diff --git a/components-starter/camel-corda-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-corda-starter/src/main/resources/META-INF/spring.factories
index a79cfd8..9f284b7 100644
--- a/components-starter/camel-corda-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-corda-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.corda.springboot.CordaComponentAutoConfiguration
+org.apache.camel.component.corda.springboot.CordaComponentAutoConfiguration,\
+org.apache.camel.component.corda.springboot.CordaComponentConverter
+
diff --git a/components-starter/camel-couchbase-starter/src/main/java/org/apache/camel/component/couchbase/springboot/CouchbaseComponentAutoConfiguration.java b/components-starter/camel-couchbase-starter/src/main/java/org/apache/camel/component/couchbase/springboot/CouchbaseComponentAutoConfiguration.java
index 0bad259..4d1a3c1 100644
--- a/components-starter/camel-couchbase-starter/src/main/java/org/apache/camel/component/couchbase/springboot/CouchbaseComponentAutoConfiguration.java
+++ b/components-starter/camel-couchbase-starter/src/main/java/org/apache/camel/component/couchbase/springboot/CouchbaseComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,CouchbaseComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.couchbase"})
+@AutoConfigureAfter(CamelAutoConfiguration.class)
public class CouchbaseComponentAutoConfiguration {
@Autowired
diff --git a/components-starter/camel-couchdb-starter/src/main/java/org/apache/camel/component/couchdb/springboot/CouchDbComponentAutoConfiguration.java b/components-starter/camel-couchdb-starter/src/main/java/org/apache/camel/component/couchdb/springboot/CouchDbComponentAutoConfiguration.java
index 69bd825..2d7166e 100644
--- a/components-starter/camel-couchdb-starter/src/main/java/org/apache/camel/component/couchdb/springboot/CouchDbComponentAutoConfiguration.java
+++ b/components-starter/camel-couchdb-starter/src/main/java/org/apache/camel/component/couchdb/springboot/CouchDbComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,CouchDbComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.couchdb"})
+@AutoConfigureAfter(CamelAutoConfiguration.class)
public class CouchDbComponentAutoConfiguration {
@Autowired
diff --git a/components-starter/camel-cron-starter/src/main/java/org/apache/camel/component/cron/springboot/CronComponentAutoConfiguration.java b/components-starter/camel-cron-starter/src/main/java/org/apache/camel/component/cron/springboot/CronComponentAutoConfiguration.java
index 11454ac..a73c56b 100644
--- a/components-starter/camel-cron-starter/src/main/java/org/apache/camel/component/cron/springboot/CronComponentAutoConfiguration.java
+++ b/components-starter/camel-cron-starter/src/main/java/org/apache/camel/component/cron/springboot/CronComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,CronComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.cron"})
+@AutoConfigureAfter(CamelAutoConfiguration.class)
public class CronComponentAutoConfiguration {
@Autowired
diff --git a/components-starter/camel-crypto-cms-starter/src/main/java/org/apache/camel/component/crypto/cms/springboot/CryptoCmsComponentAutoConfiguration.java b/components-starter/camel-crypto-cms-starter/src/main/java/org/apache/camel/component/crypto/cms/springboot/CryptoCmsComponentAutoConfiguration.java
index 0a36950..eeebb6b 100644
--- a/components-starter/camel-crypto-cms-starter/src/main/java/org/apache/camel/component/crypto/cms/springboot/CryptoCmsComponentAutoConfiguration.java
+++ b/components-starter/camel-crypto-cms-starter/src/main/java/org/apache/camel/component/crypto/cms/springboot/CryptoCmsComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,CryptoCmsComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.crypto-cms"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, CryptoCmsComponentConverter.class})
public class CryptoCmsComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class CryptoCmsComponentAutoConfiguration {
public CryptoCmsComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new CryptoCmsComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-crypto-cms-starter/src/main/java/org/apache/camel/component/crypto/cms/springboot/CryptoCmsComponentConverter.java b/components-starter/camel-crypto-cms-starter/src/main/java/org/apache/camel/component/crypto/cms/springboot/CryptoCmsComponentConverter.java
index 68c66d9..470edc8 100644
--- a/components-starter/camel-crypto-cms-starter/src/main/java/org/apache/camel/component/crypto/cms/springboot/CryptoCmsComponentConverter.java
+++ b/components-starter/camel-crypto-cms-starter/src/main/java/org/apache/camel/component/crypto/cms/springboot/CryptoCmsComponentConverter.java
@@ -19,24 +19,25 @@ package org.apache.camel.component.crypto.cms.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class CryptoCmsComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class CryptoCmsComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public CryptoCmsComponentConverter(
- org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -58,8 +59,8 @@ public class CryptoCmsComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "org.apache.camel.component.crypto.cms.crypt.EnvelopedDataDecryptorConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.crypto.cms.crypt.EnvelopedDataDecryptorConfiguration.class);
- case "org.apache.camel.component.crypto.cms.sig.SignedDataVerifierConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.crypto.cms.sig.SignedDataVerifierConfiguration.class);
+ case "org.apache.camel.component.crypto.cms.crypt.EnvelopedDataDecryptorConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.crypto.cms.crypt.EnvelopedDataDecryptorConfiguration.class);
+ case "org.apache.camel.component.crypto.cms.sig.SignedDataVerifierConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.crypto.cms.sig.SignedDataVerifierConfiguration.class);
}
return null;
}
diff --git a/components-starter/camel-crypto-cms-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-crypto-cms-starter/src/main/resources/META-INF/spring.factories
index 106227d..64d9d1d 100644
--- a/components-starter/camel-crypto-cms-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-crypto-cms-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.crypto.cms.springboot.CryptoCmsComponentAutoConfiguration
+org.apache.camel.component.crypto.cms.springboot.CryptoCmsComponentAutoConfiguration,\
+org.apache.camel.component.crypto.cms.springboot.CryptoCmsComponentConverter
+
diff --git a/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/component/crypto/springboot/DigitalSignatureComponentAutoConfiguration.java b/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/component/crypto/springboot/DigitalSignatureComponentAutoConfiguration.java
index 3c280c3..27ef248 100644
--- a/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/component/crypto/springboot/DigitalSignatureComponentAutoConfiguration.java
+++ b/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/component/crypto/springboot/DigitalSignatureComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,DigitalSignatureComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.crypto"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, DigitalSignatureComponentConverter.class})
public class DigitalSignatureComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class DigitalSignatureComponentAutoConfiguration {
public DigitalSignatureComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new DigitalSignatureComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/component/crypto/springboot/DigitalSignatureComponentConverter.java b/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/component/crypto/springboot/DigitalSignatureComponentConverter.java
index 3e5c306..05a99ee 100644
--- a/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/component/crypto/springboot/DigitalSignatureComponentConverter.java
+++ b/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/component/crypto/springboot/DigitalSignatureComponentConverter.java
@@ -19,24 +19,25 @@ package org.apache.camel.component.crypto.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class DigitalSignatureComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class DigitalSignatureComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public DigitalSignatureComponentConverter(
- org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -63,13 +64,13 @@ public class DigitalSignatureComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "java.security.KeyStore": return camelContext.getRegistry().lookupByNameAndType(ref, java.security.KeyStore.class);
- case "java.security.PrivateKey": return camelContext.getRegistry().lookupByNameAndType(ref, java.security.PrivateKey.class);
- case "java.security.cert.Certificate": return camelContext.getRegistry().lookupByNameAndType(ref, java.security.cert.Certificate.class);
- case "org.apache.camel.component.crypto.DigitalSignatureConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.crypto.DigitalSignatureConfiguration.class);
- case "org.apache.camel.support.jsse.KeyStoreParameters": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.support.jsse.KeyStoreParameters.class);
- case "java.security.PublicKey": return camelContext.getRegistry().lookupByNameAndType(ref, java.security.PublicKey.class);
- case "java.security.SecureRandom": return camelContext.getRegistry().lookupByNameAndType(ref, java.security.SecureRandom.class);
+ case "java.security.KeyStore": return applicationContext.getBean(ref, java.security.KeyStore.class);
+ case "java.security.PrivateKey": return applicationContext.getBean(ref, java.security.PrivateKey.class);
+ case "java.security.cert.Certificate": return applicationContext.getBean(ref, java.security.cert.Certificate.class);
+ case "org.apache.camel.component.crypto.DigitalSignatureConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.crypto.DigitalSignatureConfiguration.class);
+ case "org.apache.camel.support.jsse.KeyStoreParameters": return applicationContext.getBean(ref, org.apache.camel.support.jsse.KeyStoreParameters.class);
+ case "java.security.PublicKey": return applicationContext.getBean(ref, java.security.PublicKey.class);
+ case "java.security.SecureRandom": return applicationContext.getBean(ref, java.security.SecureRandom.class);
}
return null;
}
diff --git a/components-starter/camel-crypto-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-crypto-starter/src/main/resources/META-INF/spring.factories
index e2444af..0d30b6e 100644
--- a/components-starter/camel-crypto-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-crypto-starter/src/main/resources/META-INF/spring.factories
@@ -17,6 +17,8 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
org.apache.camel.converter.crypto.springboot.CryptoDataFormatAutoConfiguration,\
org.apache.camel.component.crypto.springboot.DigitalSignatureComponentAutoConfiguration,\
-org.apache.camel.converter.crypto.springboot.PGPDataFormatAutoConfiguration
+org.apache.camel.converter.crypto.springboot.PGPDataFormatAutoConfiguration,\
+org.apache.camel.component.crypto.springboot.DigitalSignatureComponentConverter
+
diff --git a/components-starter/camel-cxf-starter/src/main/java/org/apache/camel/component/cxf/jaxrs/springboot/CxfRsComponentAutoConfiguration.java b/components-starter/camel-cxf-starter/src/main/java/org/apache/camel/component/cxf/jaxrs/springboot/CxfRsComponentAutoConfiguration.java
index cd97433..5bf799a 100644
--- a/components-starter/camel-cxf-starter/src/main/java/org/apache/camel/component/cxf/jaxrs/springboot/CxfRsComponentAutoConfiguration.java
+++ b/components-starter/camel-cxf-starter/src/main/java/org/apache/camel/component/cxf/jaxrs/springboot/CxfRsComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,CxfRsComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.cxfrs"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, CxfRsComponentConverter.class})
public class CxfRsComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class CxfRsComponentAutoConfiguration {
public CxfRsComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new CxfRsComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-cxf-starter/src/main/java/org/apache/camel/component/cxf/jaxrs/springboot/CxfRsComponentConverter.java b/components-starter/camel-cxf-starter/src/main/java/org/apache/camel/component/cxf/jaxrs/springboot/CxfRsComponentConverter.java
index 18e1823..56d4523 100644
--- a/components-starter/camel-cxf-starter/src/main/java/org/apache/camel/component/cxf/jaxrs/springboot/CxfRsComponentConverter.java
+++ b/components-starter/camel-cxf-starter/src/main/java/org/apache/camel/component/cxf/jaxrs/springboot/CxfRsComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.cxf.jaxrs.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class CxfRsComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class CxfRsComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public CxfRsComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -56,7 +58,7 @@ public class CxfRsComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "org.apache.camel.spi.HeaderFilterStrategy": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.spi.HeaderFilterStrategy.class);
+ case "org.apache.camel.spi.HeaderFilterStrategy": return applicationContext.getBean(ref, org.apache.camel.spi.HeaderFilterStrategy.class);
}
return null;
}
diff --git a/components-starter/camel-cxf-starter/src/main/java/org/apache/camel/component/cxf/springboot/CxfComponentAutoConfiguration.java b/components-starter/camel-cxf-starter/src/main/java/org/apache/camel/component/cxf/springboot/CxfComponentAutoConfiguration.java
index cedba2c..50da779 100644
--- a/components-starter/camel-cxf-starter/src/main/java/org/apache/camel/component/cxf/springboot/CxfComponentAutoConfiguration.java
+++ b/components-starter/camel-cxf-starter/src/main/java/org/apache/camel/component/cxf/springboot/CxfComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,CxfComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.cxf"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, CxfComponentConverter.class})
public class CxfComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class CxfComponentAutoConfiguration {
public CxfComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new CxfComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-cxf-starter/src/main/java/org/apache/camel/component/cxf/springboot/CxfComponentConverter.java b/components-starter/camel-cxf-starter/src/main/java/org/apache/camel/component/cxf/springboot/CxfComponentConverter.java
index 954b493..be14387 100644
--- a/components-starter/camel-cxf-starter/src/main/java/org/apache/camel/component/cxf/springboot/CxfComponentConverter.java
+++ b/components-starter/camel-cxf-starter/src/main/java/org/apache/camel/component/cxf/springboot/CxfComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.cxf.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class CxfComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class CxfComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public CxfComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -56,7 +58,7 @@ public class CxfComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "org.apache.camel.spi.HeaderFilterStrategy": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.spi.HeaderFilterStrategy.class);
+ case "org.apache.camel.spi.HeaderFilterStrategy": return applicationContext.getBean(ref, org.apache.camel.spi.HeaderFilterStrategy.class);
}
return null;
}
diff --git a/components-starter/camel-cxf-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-cxf-starter/src/main/resources/META-INF/spring.factories
index ac81a56..809d734 100644
--- a/components-starter/camel-cxf-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-cxf-starter/src/main/resources/META-INF/spring.factories
@@ -16,5 +16,9 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
org.apache.camel.component.cxf.springboot.CxfComponentAutoConfiguration,\
-org.apache.camel.component.cxf.jaxrs.springboot.CxfRsComponentAutoConfiguration
+org.apache.camel.component.cxf.jaxrs.springboot.CxfRsComponentAutoConfiguration,\
+org.apache.camel.component.cxf.jaxrs.springboot.CxfRsComponentConverter,\
+org.apache.camel.component.cxf.springboot.CxfComponentConverter
+
+
diff --git a/components-starter/camel-dataformat-starter/src/main/java/org/apache/camel/component/dataformat/springboot/DataFormatComponentAutoConfiguration.java b/components-starter/camel-dataformat-starter/src/main/java/org/apache/camel/component/dataformat/springboot/DataFormatComponentAutoConfiguration.java
index 1866e42..c34bf4e 100644
--- a/components-starter/camel-dataformat-starter/src/main/java/org/apache/camel/component/dataformat/springboot/DataFormatComponentAutoConfiguration.java
+++ b/components-starter/camel-dataformat-starter/src/main/java/org/apache/camel/component/dataformat/springboot/DataFormatComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,DataFormatComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.dataformat"})
+@AutoConfigureAfter(CamelAutoConfiguration.class)
public class DataFormatComponentAutoConfiguration {
@Autowired
diff --git a/components-starter/camel-dataset-starter/src/main/java/org/apache/camel/component/dataset/springboot/DataSetComponentAutoConfiguration.java b/components-starter/camel-dataset-starter/src/main/java/org/apache/camel/component/dataset/springboot/DataSetComponentAutoConfiguration.java
index c8556b8..590ccae 100644
--- a/components-starter/camel-dataset-starter/src/main/java/org/apache/camel/component/dataset/springboot/DataSetComponentAutoConfiguration.java
+++ b/components-starter/camel-dataset-starter/src/main/java/org/apache/camel/component/dataset/springboot/DataSetComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,DataSetComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.dataset"})
+@AutoConfigureAfter(CamelAutoConfiguration.class)
public class DataSetComponentAutoConfiguration {
@Autowired
diff --git a/components-starter/camel-dataset-starter/src/main/java/org/apache/camel/component/dataset/springboot/DataSetTestComponentAutoConfiguration.java b/components-starter/camel-dataset-starter/src/main/java/org/apache/camel/component/dataset/springboot/DataSetTestComponentAutoConfiguration.java
index 21149e8..14d4730 100644
--- a/components-starter/camel-dataset-starter/src/main/java/org/apache/camel/component/dataset/springboot/DataSetTestComponentAutoConfiguration.java
+++ b/components-starter/camel-dataset-starter/src/main/java/org/apache/camel/component/dataset/springboot/DataSetTestComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,DataSetTestComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.dataset-test"})
+@AutoConfigureAfter(CamelAutoConfiguration.class)
public class DataSetTestComponentAutoConfiguration {
@Autowired
diff --git a/components-starter/camel-debezium-mongodb-starter/src/main/java/org/apache/camel/component/debezium/springboot/DebeziumMongodbComponentAutoConfiguration.java b/components-starter/camel-debezium-mongodb-starter/src/main/java/org/apache/camel/component/debezium/springboot/DebeziumMongodbComponentAutoConfiguration.java
index 06eb4ea..2de82a4 100644
--- a/components-starter/camel-debezium-mongodb-starter/src/main/java/org/apache/camel/component/debezium/springboot/DebeziumMongodbComponentAutoConfiguration.java
+++ b/components-starter/camel-debezium-mongodb-starter/src/main/java/org/apache/camel/component/debezium/springboot/DebeziumMongodbComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,DebeziumMongodbComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.debezium-mongodb"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, DebeziumMongodbComponentConverter.class})
public class DebeziumMongodbComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class DebeziumMongodbComponentAutoConfiguration {
public DebeziumMongodbComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new DebeziumMongodbComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-debezium-mongodb-starter/src/main/java/org/apache/camel/component/debezium/springboot/DebeziumMongodbComponentConverter.java b/components-starter/camel-debezium-mongodb-starter/src/main/java/org/apache/camel/component/debezium/springboot/DebeziumMongodbComponentConverter.java
index 6f3ada6..5d0cd22 100644
--- a/components-starter/camel-debezium-mongodb-starter/src/main/java/org/apache/camel/component/debezium/springboot/DebeziumMongodbComponentConverter.java
+++ b/components-starter/camel-debezium-mongodb-starter/src/main/java/org/apache/camel/component/debezium/springboot/DebeziumMongodbComponentConverter.java
@@ -19,24 +19,25 @@ package org.apache.camel.component.debezium.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class DebeziumMongodbComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class DebeziumMongodbComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public DebeziumMongodbComponentConverter(
- org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -57,7 +58,7 @@ public class DebeziumMongodbComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "org.apache.camel.component.debezium.configuration.MongoDbConnectorEmbeddedDebeziumConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.debezium.configuration.MongoDbConnectorEmbeddedDebeziumConfiguration.class);
+ case "org.apache.camel.component.debezium.configuration.MongoDbConnectorEmbeddedDebeziumConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.debezium.configuration.MongoDbConnectorEmbeddedDebeziumConfiguration.class);
}
return null;
}
diff --git a/components-starter/camel-debezium-mongodb-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-debezium-mongodb-starter/src/main/resources/META-INF/spring.factories
index 09fcee7..335eab0 100644
--- a/components-starter/camel-debezium-mongodb-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-debezium-mongodb-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.debezium.springboot.DebeziumMongodbComponentAutoConfiguration
+org.apache.camel.component.debezium.springboot.DebeziumMongodbComponentAutoConfiguration,\
+org.apache.camel.component.debezium.springboot.DebeziumMongodbComponentConverter
+
diff --git a/components-starter/camel-debezium-mysql-starter/src/main/java/org/apache/camel/component/debezium/springboot/DebeziumMySqlComponentAutoConfiguration.java b/components-starter/camel-debezium-mysql-starter/src/main/java/org/apache/camel/component/debezium/springboot/DebeziumMySqlComponentAutoConfiguration.java
index 08d88aa..37779cd 100644
--- a/components-starter/camel-debezium-mysql-starter/src/main/java/org/apache/camel/component/debezium/springboot/DebeziumMySqlComponentAutoConfiguration.java
+++ b/components-starter/camel-debezium-mysql-starter/src/main/java/org/apache/camel/component/debezium/springboot/DebeziumMySqlComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,DebeziumMySqlComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.debezium-mysql"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, DebeziumMySqlComponentConverter.class})
public class DebeziumMySqlComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class DebeziumMySqlComponentAutoConfiguration {
public DebeziumMySqlComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new DebeziumMySqlComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-debezium-mysql-starter/src/main/java/org/apache/camel/component/debezium/springboot/DebeziumMySqlComponentConverter.java b/components-starter/camel-debezium-mysql-starter/src/main/java/org/apache/camel/component/debezium/springboot/DebeziumMySqlComponentConverter.java
index 0d9be6a..e7e70b0 100644
--- a/components-starter/camel-debezium-mysql-starter/src/main/java/org/apache/camel/component/debezium/springboot/DebeziumMySqlComponentConverter.java
+++ b/components-starter/camel-debezium-mysql-starter/src/main/java/org/apache/camel/component/debezium/springboot/DebeziumMySqlComponentConverter.java
@@ -19,24 +19,25 @@ package org.apache.camel.component.debezium.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class DebeziumMySqlComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class DebeziumMySqlComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public DebeziumMySqlComponentConverter(
- org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -57,7 +58,7 @@ public class DebeziumMySqlComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "org.apache.camel.component.debezium.configuration.MySqlConnectorEmbeddedDebeziumConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.debezium.configuration.MySqlConnectorEmbeddedDebeziumConfiguration.class);
+ case "org.apache.camel.component.debezium.configuration.MySqlConnectorEmbeddedDebeziumConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.debezium.configuration.MySqlConnectorEmbeddedDebeziumConfiguration.class);
}
return null;
}
diff --git a/components-starter/camel-debezium-mysql-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-debezium-mysql-starter/src/main/resources/META-INF/spring.factories
index 913f3f1..f24cbf2 100644
--- a/components-starter/camel-debezium-mysql-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-debezium-mysql-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.debezium.springboot.DebeziumMySqlComponentAutoConfiguration
+org.apache.camel.component.debezium.springboot.DebeziumMySqlComponentAutoConfiguration,\
+org.apache.camel.component.debezium.springboot.DebeziumMySqlComponentConverter
+
diff --git a/components-starter/camel-debezium-postgres-starter/src/main/java/org/apache/camel/component/debezium/springboot/DebeziumPostgresComponentAutoConfiguration.java b/components-starter/camel-debezium-postgres-starter/src/main/java/org/apache/camel/component/debezium/springboot/DebeziumPostgresComponentAutoConfiguration.java
index 7e914a2..6ffb398 100644
--- a/components-starter/camel-debezium-postgres-starter/src/main/java/org/apache/camel/component/debezium/springboot/DebeziumPostgresComponentAutoConfiguration.java
+++ b/components-starter/camel-debezium-postgres-starter/src/main/java/org/apache/camel/component/debezium/springboot/DebeziumPostgresComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,DebeziumPostgresComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.debezium-postgres"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, DebeziumPostgresComponentConverter.class})
public class DebeziumPostgresComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class DebeziumPostgresComponentAutoConfiguration {
public DebeziumPostgresComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new DebeziumPostgresComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-debezium-postgres-starter/src/main/java/org/apache/camel/component/debezium/springboot/DebeziumPostgresComponentConverter.java b/components-starter/camel-debezium-postgres-starter/src/main/java/org/apache/camel/component/debezium/springboot/DebeziumPostgresComponentConverter.java
index 8dc523b..b369b8c 100644
--- a/components-starter/camel-debezium-postgres-starter/src/main/java/org/apache/camel/component/debezium/springboot/DebeziumPostgresComponentConverter.java
+++ b/components-starter/camel-debezium-postgres-starter/src/main/java/org/apache/camel/component/debezium/springboot/DebeziumPostgresComponentConverter.java
@@ -19,24 +19,25 @@ package org.apache.camel.component.debezium.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class DebeziumPostgresComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class DebeziumPostgresComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public DebeziumPostgresComponentConverter(
- org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -57,7 +58,7 @@ public class DebeziumPostgresComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "org.apache.camel.component.debezium.configuration.PostgresConnectorEmbeddedDebeziumConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.debezium.configuration.PostgresConnectorEmbeddedDebeziumConfiguration.class);
+ case "org.apache.camel.component.debezium.configuration.PostgresConnectorEmbeddedDebeziumConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.debezium.configuration.PostgresConnectorEmbeddedDebeziumConfiguration.class);
}
return null;
}
diff --git a/components-starter/camel-debezium-postgres-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-debezium-postgres-starter/src/main/resources/META-INF/spring.factories
index 3a7c545..fb91d58 100644
--- a/components-starter/camel-debezium-postgres-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-debezium-postgres-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.debezium.springboot.DebeziumPostgresComponentAutoConfiguration
+org.apache.camel.component.debezium.springboot.DebeziumPostgresComponentAutoConfiguration,\
+org.apache.camel.component.debezium.springboot.DebeziumPostgresComponentConverter
+
diff --git a/components-starter/camel-debezium-sqlserver-starter/src/main/java/org/apache/camel/component/debezium/springboot/DebeziumSqlserverComponentAutoConfiguration.java b/components-starter/camel-debezium-sqlserver-starter/src/main/java/org/apache/camel/component/debezium/springboot/DebeziumSqlserverComponentAutoConfiguration.java
index 5498fb6..bbe5b6e 100644
--- a/components-starter/camel-debezium-sqlserver-starter/src/main/java/org/apache/camel/component/debezium/springboot/DebeziumSqlserverComponentAutoConfiguration.java
+++ b/components-starter/camel-debezium-sqlserver-starter/src/main/java/org/apache/camel/component/debezium/springboot/DebeziumSqlserverComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,DebeziumSqlserverComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.debezium-sqlserver"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, DebeziumSqlserverComponentConverter.class})
public class DebeziumSqlserverComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class DebeziumSqlserverComponentAutoConfiguration {
public DebeziumSqlserverComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new DebeziumSqlserverComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-debezium-sqlserver-starter/src/main/java/org/apache/camel/component/debezium/springboot/DebeziumSqlserverComponentConverter.java b/components-starter/camel-debezium-sqlserver-starter/src/main/java/org/apache/camel/component/debezium/springboot/DebeziumSqlserverComponentConverter.java
index 3170502..a4f7f2e 100644
--- a/components-starter/camel-debezium-sqlserver-starter/src/main/java/org/apache/camel/component/debezium/springboot/DebeziumSqlserverComponentConverter.java
+++ b/components-starter/camel-debezium-sqlserver-starter/src/main/java/org/apache/camel/component/debezium/springboot/DebeziumSqlserverComponentConverter.java
@@ -19,24 +19,25 @@ package org.apache.camel.component.debezium.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class DebeziumSqlserverComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class DebeziumSqlserverComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public DebeziumSqlserverComponentConverter(
- org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -57,7 +58,7 @@ public class DebeziumSqlserverComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "org.apache.camel.component.debezium.configuration.SqlServerConnectorEmbeddedDebeziumConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.debezium.configuration.SqlServerConnectorEmbeddedDebeziumConfiguration.class);
+ case "org.apache.camel.component.debezium.configuration.SqlServerConnectorEmbeddedDebeziumConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.debezium.configuration.SqlServerConnectorEmbeddedDebeziumConfiguration.class);
}
return null;
}
diff --git a/components-starter/camel-debezium-sqlserver-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-debezium-sqlserver-starter/src/main/resources/META-INF/spring.factories
index 36c72e8..3b2439d 100644
--- a/components-starter/camel-debezium-sqlserver-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-debezium-sqlserver-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.debezium.springboot.DebeziumSqlserverComponentAutoConfiguration
+org.apache.camel.component.debezium.springboot.DebeziumSqlserverComponentAutoConfiguration,\
+org.apache.camel.component.debezium.springboot.DebeziumSqlserverComponentConverter
+
diff --git a/components-starter/camel-digitalocean-starter/src/main/java/org/apache/camel/component/digitalocean/springboot/DigitalOceanComponentAutoConfiguration.java b/components-starter/camel-digitalocean-starter/src/main/java/org/apache/camel/component/digitalocean/springboot/DigitalOceanComponentAutoConfiguration.java
index 34781f5..fa66735 100644
--- a/components-starter/camel-digitalocean-starter/src/main/java/org/apache/camel/component/digitalocean/springboot/DigitalOceanComponentAutoConfiguration.java
+++ b/components-starter/camel-digitalocean-starter/src/main/java/org/apache/camel/component/digitalocean/springboot/DigitalOceanComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,DigitalOceanComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.digitalocean"})
+@AutoConfigureAfter(CamelAutoConfiguration.class)
public class DigitalOceanComponentAutoConfiguration {
@Autowired
diff --git a/components-starter/camel-direct-starter/src/main/java/org/apache/camel/component/direct/springboot/DirectComponentAutoConfiguration.java b/components-starter/camel-direct-starter/src/main/java/org/apache/camel/component/direct/springboot/DirectComponentAutoConfiguration.java
index 23331e1..eb8811c 100644
--- a/components-starter/camel-direct-starter/src/main/java/org/apache/camel/component/direct/springboot/DirectComponentAutoConfiguration.java
+++ b/components-starter/camel-direct-starter/src/main/java/org/apache/camel/component/direct/springboot/DirectComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,DirectComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.direct"})
+@AutoConfigureAfter(CamelAutoConfiguration.class)
public class DirectComponentAutoConfiguration {
@Autowired
diff --git a/components-starter/camel-directvm-starter/src/main/java/org/apache/camel/component/directvm/springboot/DirectVmComponentAutoConfiguration.java b/components-starter/camel-directvm-starter/src/main/java/org/apache/camel/component/directvm/springboot/DirectVmComponentAutoConfiguration.java
index ef04a77..865a892 100644
--- a/components-starter/camel-directvm-starter/src/main/java/org/apache/camel/component/directvm/springboot/DirectVmComponentAutoConfiguration.java
+++ b/components-starter/camel-directvm-starter/src/main/java/org/apache/camel/component/directvm/springboot/DirectVmComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,DirectVmComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.direct-vm"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, DirectVmComponentConverter.class})
public class DirectVmComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class DirectVmComponentAutoConfiguration {
public DirectVmComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new DirectVmComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-directvm-starter/src/main/java/org/apache/camel/component/directvm/springboot/DirectVmComponentConverter.java b/components-starter/camel-directvm-starter/src/main/java/org/apache/camel/component/directvm/springboot/DirectVmComponentConverter.java
index b267cb7..26e914a 100644
--- a/components-starter/camel-directvm-starter/src/main/java/org/apache/camel/component/directvm/springboot/DirectVmComponentConverter.java
+++ b/components-starter/camel-directvm-starter/src/main/java/org/apache/camel/component/directvm/springboot/DirectVmComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.directvm.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class DirectVmComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class DirectVmComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public DirectVmComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -56,7 +58,7 @@ public class DirectVmComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "org.apache.camel.spi.HeaderFilterStrategy": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.spi.HeaderFilterStrategy.class);
+ case "org.apache.camel.spi.HeaderFilterStrategy": return applicationContext.getBean(ref, org.apache.camel.spi.HeaderFilterStrategy.class);
}
return null;
}
diff --git a/components-starter/camel-directvm-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-directvm-starter/src/main/resources/META-INF/spring.factories
index d0ccb66..9c6f105 100644
--- a/components-starter/camel-directvm-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-directvm-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.directvm.springboot.DirectVmComponentAutoConfiguration
+org.apache.camel.component.directvm.springboot.DirectVmComponentAutoConfiguration,\
+org.apache.camel.component.directvm.springboot.DirectVmComponentConverter
+
diff --git a/components-starter/camel-disruptor-starter/src/main/java/org/apache/camel/component/disruptor/springboot/DisruptorComponentAutoConfiguration.java b/components-starter/camel-disruptor-starter/src/main/java/org/apache/camel/component/disruptor/springboot/DisruptorComponentAutoConfiguration.java
index 9af4fea..80797fa 100644
--- a/components-starter/camel-disruptor-starter/src/main/java/org/apache/camel/component/disruptor/springboot/DisruptorComponentAutoConfiguration.java
+++ b/components-starter/camel-disruptor-starter/src/main/java/org/apache/camel/component/disruptor/springboot/DisruptorComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,DisruptorComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.disruptor"})
+@AutoConfigureAfter(CamelAutoConfiguration.class)
public class DisruptorComponentAutoConfiguration {
@Autowired
diff --git a/components-starter/camel-disruptor-starter/src/main/java/org/apache/camel/component/disruptor/vm/springboot/DisruptorVmComponentAutoConfiguration.java b/components-starter/camel-disruptor-starter/src/main/java/org/apache/camel/component/disruptor/vm/springboot/DisruptorVmComponentAutoConfiguration.java
index 6d31813..366800e 100644
--- a/components-starter/camel-disruptor-starter/src/main/java/org/apache/camel/component/disruptor/vm/springboot/DisruptorVmComponentAutoConfiguration.java
+++ b/components-starter/camel-disruptor-starter/src/main/java/org/apache/camel/component/disruptor/vm/springboot/DisruptorVmComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,DisruptorVmComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.disruptor-vm"})
+@AutoConfigureAfter(CamelAutoConfiguration.class)
public class DisruptorVmComponentAutoConfiguration {
@Autowired
diff --git a/components-starter/camel-djl-starter/src/main/java/org/apache/camel/component/djl/springboot/DJLComponentAutoConfiguration.java b/components-starter/camel-djl-starter/src/main/java/org/apache/camel/component/djl/springboot/DJLComponentAutoConfiguration.java
index 2c296eb..3cadd4f 100644
--- a/components-starter/camel-djl-starter/src/main/java/org/apache/camel/component/djl/springboot/DJLComponentAutoConfiguration.java
+++ b/components-starter/camel-djl-starter/src/main/java/org/apache/camel/component/djl/springboot/DJLComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,DJLComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.djl"})
+@AutoConfigureAfter(CamelAutoConfiguration.class)
public class DJLComponentAutoConfiguration {
@Autowired
diff --git a/components-starter/camel-dns-starter/src/main/java/org/apache/camel/component/dns/springboot/DnsComponentAutoConfiguration.java b/components-starter/camel-dns-starter/src/main/java/org/apache/camel/component/dns/springboot/DnsComponentAutoConfiguration.java
index 6910d24..950a026 100644
--- a/components-starter/camel-dns-starter/src/main/java/org/apache/camel/component/dns/springboot/DnsComponentAutoConfiguration.java
+++ b/components-starter/camel-dns-starter/src/main/java/org/apache/camel/component/dns/springboot/DnsComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,DnsComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.dns"})
+@AutoConfigureAfter(CamelAutoConfiguration.class)
public class DnsComponentAutoConfiguration {
@Autowired
diff --git a/components-starter/camel-docker-starter/src/main/java/org/apache/camel/component/docker/springboot/DockerComponentAutoConfiguration.java b/components-starter/camel-docker-starter/src/main/java/org/apache/camel/component/docker/springboot/DockerComponentAutoConfiguration.java
index 1428d2d..933e58e 100644
--- a/components-starter/camel-docker-starter/src/main/java/org/apache/camel/component/docker/springboot/DockerComponentAutoConfiguration.java
+++ b/components-starter/camel-docker-starter/src/main/java/org/apache/camel/component/docker/springboot/DockerComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,DockerComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.docker"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, DockerComponentConverter.class})
public class DockerComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class DockerComponentAutoConfiguration {
public DockerComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new DockerComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-docker-starter/src/main/java/org/apache/camel/component/docker/springboot/DockerComponentConverter.java b/components-starter/camel-docker-starter/src/main/java/org/apache/camel/component/docker/springboot/DockerComponentConverter.java
index 7f9a2e1..9ef76a9 100644
--- a/components-starter/camel-docker-starter/src/main/java/org/apache/camel/component/docker/springboot/DockerComponentConverter.java
+++ b/components-starter/camel-docker-starter/src/main/java/org/apache/camel/component/docker/springboot/DockerComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.docker.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class DockerComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class DockerComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public DockerComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -56,7 +58,7 @@ public class DockerComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "org.apache.camel.component.docker.DockerConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.docker.DockerConfiguration.class);
+ case "org.apache.camel.component.docker.DockerConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.docker.DockerConfiguration.class);
}
return null;
}
diff --git a/components-starter/camel-docker-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-docker-starter/src/main/resources/META-INF/spring.factories
index 3bf9301..6e4dc80 100644
--- a/components-starter/camel-docker-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-docker-starter/src/main/resources/META-INF/spring.factories
@@ -15,4 +15,6 @@
## limitations under the License.
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.docker.springboot.DockerComponentAutoConfiguration
+org.apache.camel.component.docker.springboot.DockerComponentAutoConfiguration,\
+org.apache.camel.component.docker.springboot.DockerComponentConverter
+
diff --git a/components-starter/camel-dozer-starter/src/main/java/org/apache/camel/component/dozer/springboot/DozerComponentAutoConfiguration.java b/components-starter/camel-dozer-starter/src/main/java/org/apache/camel/component/dozer/springboot/DozerComponentAutoConfiguration.java
index d2f6f60..498ad33 100644
--- a/components-starter/camel-dozer-starter/src/main/java/org/apache/camel/component/dozer/springboot/DozerComponentAutoConfiguration.java
+++ b/components-starter/camel-dozer-starter/src/main/java/org/apache/camel/component/dozer/springboot/DozerComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,DozerComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.dozer"})
+@AutoConfigureAfter(CamelAutoConfiguration.class)
public class DozerComponentAutoConfiguration {
@Autowired
diff --git a/components-starter/camel-drill-starter/src/main/java/org/apache/camel/component/drill/springboot/DrillComponentAutoConfiguration.java b/components-starter/camel-drill-starter/src/main/java/org/apache/camel/component/drill/springboot/DrillComponentAutoConfiguration.java
index 9e4dee1..294a440 100644
--- a/components-starter/camel-drill-starter/src/main/java/org/apache/camel/component/drill/springboot/DrillComponentAutoConfiguration.java
+++ b/components-starter/camel-drill-starter/src/main/java/org/apache/camel/component/drill/springboot/DrillComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,DrillComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.drill"})
+@AutoConfigureAfter(CamelAutoConfiguration.class)
public class DrillComponentAutoConfiguration {
@Autowired
diff --git a/components-starter/camel-dropbox-starter/src/main/java/org/apache/camel/component/dropbox/springboot/DropboxComponentAutoConfiguration.java b/components-starter/camel-dropbox-starter/src/main/java/org/apache/camel/component/dropbox/springboot/DropboxComponentAutoConfiguration.java
index 9970a93..23507c3 100644
--- a/components-starter/camel-dropbox-starter/src/main/java/org/apache/camel/component/dropbox/springboot/DropboxComponentAutoConfiguration.java
+++ b/components-starter/camel-dropbox-starter/src/main/java/org/apache/camel/component/dropbox/springboot/DropboxComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,DropboxComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.dropbox"})
+@AutoConfigureAfter(CamelAutoConfiguration.class)
public class DropboxComponentAutoConfiguration {
@Autowired
diff --git a/components-starter/camel-ehcache-starter/src/main/java/org/apache/camel/component/ehcache/springboot/EhcacheComponentAutoConfiguration.java b/components-starter/camel-ehcache-starter/src/main/java/org/apache/camel/component/ehcache/springboot/EhcacheComponentAutoConfiguration.java
index 294fbc9..c25591f 100644
--- a/components-starter/camel-ehcache-starter/src/main/java/org/apache/camel/component/ehcache/springboot/EhcacheComponentAutoConfiguration.java
+++ b/components-starter/camel-ehcache-starter/src/main/java/org/apache/camel/component/ehcache/springboot/EhcacheComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,EhcacheComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.ehcache"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, EhcacheComponentConverter.class})
public class EhcacheComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class EhcacheComponentAutoConfiguration {
public EhcacheComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new EhcacheComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-ehcache-starter/src/main/java/org/apache/camel/component/ehcache/springboot/EhcacheComponentConverter.java b/components-starter/camel-ehcache-starter/src/main/java/org/apache/camel/component/ehcache/springboot/EhcacheComponentConverter.java
index 48779df..0c751ca 100644
--- a/components-starter/camel-ehcache-starter/src/main/java/org/apache/camel/component/ehcache/springboot/EhcacheComponentConverter.java
+++ b/components-starter/camel-ehcache-starter/src/main/java/org/apache/camel/component/ehcache/springboot/EhcacheComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.ehcache.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class EhcacheComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class EhcacheComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public EhcacheComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -58,9 +60,9 @@ public class EhcacheComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "org.ehcache.CacheManager": return camelContext.getRegistry().lookupByNameAndType(ref, org.ehcache.CacheManager.class);
- case "org.ehcache.config.Configuration": return camelContext.getRegistry().lookupByNameAndType(ref, org.ehcache.config.Configuration.class);
- case "org.ehcache.config.CacheConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.ehcache.config.CacheConfiguration.class);
+ case "org.ehcache.CacheManager": return applicationContext.getBean(ref, org.ehcache.CacheManager.class);
+ case "org.ehcache.config.Configuration": return applicationContext.getBean(ref, org.ehcache.config.Configuration.class);
+ case "org.ehcache.config.CacheConfiguration": return applicationContext.getBean(ref, org.ehcache.config.CacheConfiguration.class);
}
return null;
}
diff --git a/components-starter/camel-ehcache-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-ehcache-starter/src/main/resources/META-INF/spring.factories
index 572e1b0..f02e035 100644
--- a/components-starter/camel-ehcache-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-ehcache-starter/src/main/resources/META-INF/spring.factories
@@ -17,4 +17,6 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
org.apache.camel.component.ehcache.springboot.customizer.CacheManagerCustomizer,\
org.apache.camel.component.ehcache.springboot.customizer.CacheConfigurationCustomizer,\
-org.apache.camel.component.ehcache.springboot.EhcacheComponentAutoConfiguration
+org.apache.camel.component.ehcache.springboot.EhcacheComponentAutoConfiguration,\
+org.apache.camel.component.ehcache.springboot.EhcacheComponentConverter
+
diff --git a/components-starter/camel-elasticsearch-rest-starter/src/main/java/org/apache/camel/component/elasticsearch/springboot/ElasticsearchComponentAutoConfiguration.java b/components-starter/camel-elasticsearch-rest-starter/src/main/java/org/apache/camel/component/elasticsearch/springboot/ElasticsearchComponentAutoConfiguration.java
index cfe5ba4..ffe15e1 100644
--- a/components-starter/camel-elasticsearch-rest-starter/src/main/java/org/apache/camel/component/elasticsearch/springboot/ElasticsearchComponentAutoConfiguration.java
+++ b/components-starter/camel-elasticsearch-rest-starter/src/main/java/org/apache/camel/component/elasticsearch/springboot/ElasticsearchComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,ElasticsearchComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.elasticsearch-rest"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, ElasticsearchComponentConverter.class})
public class ElasticsearchComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class ElasticsearchComponentAutoConfiguration {
public ElasticsearchComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new ElasticsearchComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-elasticsearch-rest-starter/src/main/java/org/apache/camel/component/elasticsearch/springboot/ElasticsearchComponentConverter.java b/components-starter/camel-elasticsearch-rest-starter/src/main/java/org/apache/camel/component/elasticsearch/springboot/ElasticsearchComponentConverter.java
index beada49..d09aab4 100644
--- a/components-starter/camel-elasticsearch-rest-starter/src/main/java/org/apache/camel/component/elasticsearch/springboot/ElasticsearchComponentConverter.java
+++ b/components-starter/camel-elasticsearch-rest-starter/src/main/java/org/apache/camel/component/elasticsearch/springboot/ElasticsearchComponentConverter.java
@@ -19,24 +19,25 @@ package org.apache.camel.component.elasticsearch.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class ElasticsearchComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class ElasticsearchComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public ElasticsearchComponentConverter(
- org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -57,7 +58,7 @@ public class ElasticsearchComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "org.elasticsearch.client.RestClient": return camelContext.getRegistry().lookupByNameAndType(ref, org.elasticsearch.client.RestClient.class);
+ case "org.elasticsearch.client.RestClient": return applicationContext.getBean(ref, org.elasticsearch.client.RestClient.class);
}
return null;
}
diff --git a/components-starter/camel-elasticsearch-rest-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-elasticsearch-rest-starter/src/main/resources/META-INF/spring.factories
index 035f49d..994a6f0 100644
--- a/components-starter/camel-elasticsearch-rest-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-elasticsearch-rest-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.elasticsearch.springboot.ElasticsearchComponentAutoConfiguration
+org.apache.camel.component.elasticsearch.springboot.ElasticsearchComponentAutoConfiguration,\
+org.apache.camel.component.elasticsearch.springboot.ElasticsearchComponentConverter
+
diff --git a/components-starter/camel-elsql-starter/src/main/java/org/apache/camel/component/elsql/springboot/ElsqlComponentAutoConfiguration.java b/components-starter/camel-elsql-starter/src/main/java/org/apache/camel/component/elsql/springboot/ElsqlComponentAutoConfiguration.java
index 125edc3..f69e015 100644
--- a/components-starter/camel-elsql-starter/src/main/java/org/apache/camel/component/elsql/springboot/ElsqlComponentAutoConfiguration.java
+++ b/components-starter/camel-elsql-starter/src/main/java/org/apache/camel/component/elsql/springboot/ElsqlComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,ElsqlComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.elsql"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, ElsqlComponentConverter.class})
public class ElsqlComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class ElsqlComponentAutoConfiguration {
public ElsqlComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new ElsqlComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-elsql-starter/src/main/java/org/apache/camel/component/elsql/springboot/ElsqlComponentConverter.java b/components-starter/camel-elsql-starter/src/main/java/org/apache/camel/component/elsql/springboot/ElsqlComponentConverter.java
index 23a9642..8f98bd0 100644
--- a/components-starter/camel-elsql-starter/src/main/java/org/apache/camel/component/elsql/springboot/ElsqlComponentConverter.java
+++ b/components-starter/camel-elsql-starter/src/main/java/org/apache/camel/component/elsql/springboot/ElsqlComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.elsql.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class ElsqlComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class ElsqlComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public ElsqlComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -57,8 +59,8 @@ public class ElsqlComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "javax.sql.DataSource": return camelContext.getRegistry().lookupByNameAndType(ref, javax.sql.DataSource.class);
- case "com.opengamma.elsql.ElSqlConfig": return camelContext.getRegistry().lookupByNameAndType(ref, com.opengamma.elsql.ElSqlConfig.class);
+ case "javax.sql.DataSource": return applicationContext.getBean(ref, javax.sql.DataSource.class);
+ case "com.opengamma.elsql.ElSqlConfig": return applicationContext.getBean(ref, com.opengamma.elsql.ElSqlConfig.class);
}
return null;
}
diff --git a/components-starter/camel-elsql-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-elsql-starter/src/main/resources/META-INF/spring.factories
index c842289..6115aa1 100644
--- a/components-starter/camel-elsql-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-elsql-starter/src/main/resources/META-INF/spring.factories
@@ -15,4 +15,6 @@
## limitations under the License.
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.elsql.springboot.ElsqlComponentAutoConfiguration
+org.apache.camel.component.elsql.springboot.ElsqlComponentAutoConfiguration,\
+org.apache.camel.component.elsql.springboot.ElsqlComponentConverter
+
diff --git a/components-starter/camel-etcd-starter/src/main/java/org/apache/camel/component/etcd/springboot/EtcdKeysComponentAutoConfiguration.java b/components-starter/camel-etcd-starter/src/main/java/org/apache/camel/component/etcd/springboot/EtcdKeysComponentAutoConfiguration.java
index 9878068..d5ef9d1 100644
--- a/components-starter/camel-etcd-starter/src/main/java/org/apache/camel/component/etcd/springboot/EtcdKeysComponentAutoConfiguration.java
+++ b/components-starter/camel-etcd-starter/src/main/java/org/apache/camel/component/etcd/springboot/EtcdKeysComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,EtcdKeysComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.etcd-keys"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, EtcdKeysComponentConverter.class})
public class EtcdKeysComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class EtcdKeysComponentAutoConfiguration {
public EtcdKeysComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new EtcdKeysComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-etcd-starter/src/main/java/org/apache/camel/component/etcd/springboot/EtcdKeysComponentConverter.java b/components-starter/camel-etcd-starter/src/main/java/org/apache/camel/component/etcd/springboot/EtcdKeysComponentConverter.java
index b97f964..b74669d 100644
--- a/components-starter/camel-etcd-starter/src/main/java/org/apache/camel/component/etcd/springboot/EtcdKeysComponentConverter.java
+++ b/components-starter/camel-etcd-starter/src/main/java/org/apache/camel/component/etcd/springboot/EtcdKeysComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.etcd.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class EtcdKeysComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class EtcdKeysComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public EtcdKeysComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -57,8 +59,8 @@ public class EtcdKeysComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "org.apache.camel.component.etcd.EtcdConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.etcd.EtcdConfiguration.class);
- case "org.apache.camel.support.jsse.SSLContextParameters": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.support.jsse.SSLContextParameters.class);
+ case "org.apache.camel.component.etcd.EtcdConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.etcd.EtcdConfiguration.class);
+ case "org.apache.camel.support.jsse.SSLContextParameters": return applicationContext.getBean(ref, org.apache.camel.support.jsse.SSLContextParameters.class);
}
return null;
}
diff --git a/components-starter/camel-etcd-starter/src/main/java/org/apache/camel/component/etcd/springboot/EtcdStatsComponentAutoConfiguration.java b/components-starter/camel-etcd-starter/src/main/java/org/apache/camel/component/etcd/springboot/EtcdStatsComponentAutoConfiguration.java
index 4b6b0cd..6a93a16 100644
--- a/components-starter/camel-etcd-starter/src/main/java/org/apache/camel/component/etcd/springboot/EtcdStatsComponentAutoConfiguration.java
+++ b/components-starter/camel-etcd-starter/src/main/java/org/apache/camel/component/etcd/springboot/EtcdStatsComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,EtcdStatsComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.etcd-stats"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, EtcdStatsComponentConverter.class})
public class EtcdStatsComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class EtcdStatsComponentAutoConfiguration {
public EtcdStatsComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new EtcdStatsComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-etcd-starter/src/main/java/org/apache/camel/component/etcd/springboot/EtcdStatsComponentConverter.java b/components-starter/camel-etcd-starter/src/main/java/org/apache/camel/component/etcd/springboot/EtcdStatsComponentConverter.java
index bdcc1d8..ade94ae 100644
--- a/components-starter/camel-etcd-starter/src/main/java/org/apache/camel/component/etcd/springboot/EtcdStatsComponentConverter.java
+++ b/components-starter/camel-etcd-starter/src/main/java/org/apache/camel/component/etcd/springboot/EtcdStatsComponentConverter.java
@@ -19,24 +19,25 @@ package org.apache.camel.component.etcd.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class EtcdStatsComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class EtcdStatsComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public EtcdStatsComponentConverter(
- org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -58,8 +59,8 @@ public class EtcdStatsComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "org.apache.camel.component.etcd.EtcdConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.etcd.EtcdConfiguration.class);
- case "org.apache.camel.support.jsse.SSLContextParameters": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.support.jsse.SSLContextParameters.class);
+ case "org.apache.camel.component.etcd.EtcdConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.etcd.EtcdConfiguration.class);
+ case "org.apache.camel.support.jsse.SSLContextParameters": return applicationContext.getBean(ref, org.apache.camel.support.jsse.SSLContextParameters.class);
}
return null;
}
diff --git a/components-starter/camel-etcd-starter/src/main/java/org/apache/camel/component/etcd/springboot/EtcdWatchComponentAutoConfiguration.java b/components-starter/camel-etcd-starter/src/main/java/org/apache/camel/component/etcd/springboot/EtcdWatchComponentAutoConfiguration.java
index 9d8c801..7268874 100644
--- a/components-starter/camel-etcd-starter/src/main/java/org/apache/camel/component/etcd/springboot/EtcdWatchComponentAutoConfiguration.java
+++ b/components-starter/camel-etcd-starter/src/main/java/org/apache/camel/component/etcd/springboot/EtcdWatchComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,EtcdWatchComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.etcd-watch"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, EtcdWatchComponentConverter.class})
public class EtcdWatchComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class EtcdWatchComponentAutoConfiguration {
public EtcdWatchComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new EtcdWatchComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-etcd-starter/src/main/java/org/apache/camel/component/etcd/springboot/EtcdWatchComponentConverter.java b/components-starter/camel-etcd-starter/src/main/java/org/apache/camel/component/etcd/springboot/EtcdWatchComponentConverter.java
index e952496..07ffbc5 100644
--- a/components-starter/camel-etcd-starter/src/main/java/org/apache/camel/component/etcd/springboot/EtcdWatchComponentConverter.java
+++ b/components-starter/camel-etcd-starter/src/main/java/org/apache/camel/component/etcd/springboot/EtcdWatchComponentConverter.java
@@ -19,24 +19,25 @@ package org.apache.camel.component.etcd.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class EtcdWatchComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class EtcdWatchComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public EtcdWatchComponentConverter(
- org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -58,8 +59,8 @@ public class EtcdWatchComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "org.apache.camel.component.etcd.EtcdConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.etcd.EtcdConfiguration.class);
- case "org.apache.camel.support.jsse.SSLContextParameters": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.support.jsse.SSLContextParameters.class);
+ case "org.apache.camel.component.etcd.EtcdConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.etcd.EtcdConfiguration.class);
+ case "org.apache.camel.support.jsse.SSLContextParameters": return applicationContext.getBean(ref, org.apache.camel.support.jsse.SSLContextParameters.class);
}
return null;
}
diff --git a/components-starter/camel-etcd-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-etcd-starter/src/main/resources/META-INF/spring.factories
index 5199e0b..7be6ae1 100644
--- a/components-starter/camel-etcd-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-etcd-starter/src/main/resources/META-INF/spring.factories
@@ -18,6 +18,12 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
org.apache.camel.component.etcd.springboot.EtcdKeysComponentAutoConfiguration,\
org.apache.camel.component.etcd.springboot.EtcdWatchComponentAutoConfiguration,\
-org.apache.camel.component.etcd.springboot.EtcdStatsComponentAutoConfiguration
+org.apache.camel.component.etcd.springboot.EtcdStatsComponentAutoConfiguration,\
+org.apache.camel.component.etcd.springboot.EtcdKeysComponentConverter,\
+org.apache.camel.component.etcd.springboot.EtcdWatchComponentConverter,\
+org.apache.camel.component.etcd.springboot.EtcdStatsComponentConverter
+
+
+
diff --git a/components-starter/camel-exec-starter/src/main/java/org/apache/camel/component/exec/springboot/ExecComponentAutoConfiguration.java b/components-starter/camel-exec-starter/src/main/java/org/apache/camel/component/exec/springboot/ExecComponentAutoConfiguration.java
index 2ea651d..535ae6c 100644
--- a/components-starter/camel-exec-starter/src/main/java/org/apache/camel/component/exec/springboot/ExecComponentAutoConfiguration.java
+++ b/components-starter/camel-exec-starter/src/main/java/org/apache/camel/component/exec/springboot/ExecComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,ExecComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.exec"})
+@AutoConfigureAfter(CamelAutoConfiguration.class)
public class ExecComponentAutoConfiguration {
@Autowired
diff --git a/components-starter/camel-facebook-starter/src/main/java/org/apache/camel/component/facebook/springboot/FacebookComponentAutoConfiguration.java b/components-starter/camel-facebook-starter/src/main/java/org/apache/camel/component/facebook/springboot/FacebookComponentAutoConfiguration.java
index 5238059..01bf410 100644
--- a/components-starter/camel-facebook-starter/src/main/java/org/apache/camel/component/facebook/springboot/FacebookComponentAutoConfiguration.java
+++ b/components-starter/camel-facebook-starter/src/main/java/org/apache/camel/component/facebook/springboot/FacebookComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,FacebookComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.facebook"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, FacebookComponentConverter.class})
public class FacebookComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class FacebookComponentAutoConfiguration {
public FacebookComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new FacebookComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-facebook-starter/src/main/java/org/apache/camel/component/facebook/springboot/FacebookComponentConverter.java b/components-starter/camel-facebook-starter/src/main/java/org/apache/camel/component/facebook/springboot/FacebookComponentConverter.java
index f915f3a..5dfe821 100644
--- a/components-starter/camel-facebook-starter/src/main/java/org/apache/camel/component/facebook/springboot/FacebookComponentConverter.java
+++ b/components-starter/camel-facebook-starter/src/main/java/org/apache/camel/component/facebook/springboot/FacebookComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.facebook.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class FacebookComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class FacebookComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public FacebookComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -56,7 +58,7 @@ public class FacebookComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "org.apache.camel.component.facebook.config.FacebookConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.facebook.config.FacebookConfiguration.class);
+ case "org.apache.camel.component.facebook.config.FacebookConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.facebook.config.FacebookConfiguration.class);
}
return null;
}
diff --git a/components-starter/camel-facebook-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-facebook-starter/src/main/resources/META-INF/spring.factories
index 28ac9d6..e8f550b 100644
--- a/components-starter/camel-facebook-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-facebook-starter/src/main/resources/META-INF/spring.factories
@@ -15,4 +15,6 @@
## limitations under the License.
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.facebook.springboot.FacebookComponentAutoConfiguration
+org.apache.camel.component.facebook.springboot.FacebookComponentAutoConfiguration,\
+org.apache.camel.component.facebook.springboot.FacebookComponentConverter
+
diff --git a/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirComponentAutoConfiguration.java b/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirComponentAutoConfiguration.java
index 83fff8f..2845bcd 100644
--- a/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirComponentAutoConfiguration.java
+++ b/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,FhirComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.fhir"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, FhirComponentConverter.class})
public class FhirComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class FhirComponentAutoConfiguration {
public FhirComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new FhirComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirComponentConverter.java b/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirComponentConverter.java
index 933ea4c..c32acbb 100644
--- a/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirComponentConverter.java
+++ b/components-starter/camel-fhir-starter/src/main/java/org/apache/camel/component/fhir/springboot/FhirComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.fhir.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class FhirComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class FhirComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public FhirComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -59,10 +61,10 @@ public class FhirComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "ca.uhn.fhir.rest.client.api.IGenericClient": return camelContext.getRegistry().lookupByNameAndType(ref, ca.uhn.fhir.rest.client.api.IGenericClient.class);
- case "ca.uhn.fhir.rest.client.api.IRestfulClientFactory": return camelContext.getRegistry().lookupByNameAndType(ref, ca.uhn.fhir.rest.client.api.IRestfulClientFactory.class);
- case "org.apache.camel.component.fhir.FhirConfiguration": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.fhir.FhirConfiguration.class);
- case "ca.uhn.fhir.context.FhirContext": return camelContext.getRegistry().lookupByNameAndType(ref, ca.uhn.fhir.context.FhirContext.class);
+ case "ca.uhn.fhir.rest.client.api.IGenericClient": return applicationContext.getBean(ref, ca.uhn.fhir.rest.client.api.IGenericClient.class);
+ case "ca.uhn.fhir.rest.client.api.IRestfulClientFactory": return applicationContext.getBean(ref, ca.uhn.fhir.rest.client.api.IRestfulClientFactory.class);
+ case "org.apache.camel.component.fhir.FhirConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.fhir.FhirConfiguration.class);
+ case "ca.uhn.fhir.context.FhirContext": return applicationContext.getBean(ref, ca.uhn.fhir.context.FhirContext.class);
}
return null;
}
diff --git a/components-starter/camel-fhir-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-fhir-starter/src/main/resources/META-INF/spring.factories
index 81f3946..c25d9b2 100644
--- a/components-starter/camel-fhir-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-fhir-starter/src/main/resources/META-INF/spring.factories
@@ -18,4 +18,6 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
org.apache.camel.component.fhir.springboot.FhirJsonDataFormatAutoConfiguration,\
org.apache.camel.component.fhir.springboot.FhirXmlDataFormatAutoConfiguration,\
-org.apache.camel.component.fhir.springboot.FhirComponentAutoConfiguration
+org.apache.camel.component.fhir.springboot.FhirComponentAutoConfiguration,\
+org.apache.camel.component.fhir.springboot.FhirComponentConverter
+
diff --git a/components-starter/camel-file-starter/src/main/java/org/apache/camel/component/file/springboot/FileComponentAutoConfiguration.java b/components-starter/camel-file-starter/src/main/java/org/apache/camel/component/file/springboot/FileComponentAutoConfiguration.java
index 9998805..96c29f6 100644
--- a/components-starter/camel-file-starter/src/main/java/org/apache/camel/component/file/springboot/FileComponentAutoConfiguration.java
+++ b/components-starter/camel-file-starter/src/main/java/org/apache/camel/component/file/springboot/FileComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,FileComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.file"})
+@AutoConfigureAfter(CamelAutoConfiguration.class)
public class FileComponentAutoConfiguration {
@Autowired
diff --git a/components-starter/camel-file-watch-starter/src/main/java/org/apache/camel/component/file/watch/springboot/FileWatchComponentAutoConfiguration.java b/components-starter/camel-file-watch-starter/src/main/java/org/apache/camel/component/file/watch/springboot/FileWatchComponentAutoConfiguration.java
index f711f63..0af5a20 100644
--- a/components-starter/camel-file-watch-starter/src/main/java/org/apache/camel/component/file/watch/springboot/FileWatchComponentAutoConfiguration.java
+++ b/components-starter/camel-file-watch-starter/src/main/java/org/apache/camel/component/file/watch/springboot/FileWatchComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,FileWatchComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.file-watch"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, FileWatchComponentConverter.class})
public class FileWatchComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class FileWatchComponentAutoConfiguration {
public FileWatchComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new FileWatchComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-file-watch-starter/src/main/java/org/apache/camel/component/file/watch/springboot/FileWatchComponentConverter.java b/components-starter/camel-file-watch-starter/src/main/java/org/apache/camel/component/file/watch/springboot/FileWatchComponentConverter.java
index 2d69c0a..1fcbaf8 100644
--- a/components-starter/camel-file-watch-starter/src/main/java/org/apache/camel/component/file/watch/springboot/FileWatchComponentConverter.java
+++ b/components-starter/camel-file-watch-starter/src/main/java/org/apache/camel/component/file/watch/springboot/FileWatchComponentConverter.java
@@ -19,24 +19,25 @@ package org.apache.camel.component.file.watch.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class FileWatchComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class FileWatchComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public FileWatchComponentConverter(
- org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -57,7 +58,7 @@ public class FileWatchComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "io.methvin.watcher.hashing.FileHasher": return camelContext.getRegistry().lookupByNameAndType(ref, io.methvin.watcher.hashing.FileHasher.class);
+ case "io.methvin.watcher.hashing.FileHasher": return applicationContext.getBean(ref, io.methvin.watcher.hashing.FileHasher.class);
}
return null;
}
diff --git a/components-starter/camel-file-watch-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-file-watch-starter/src/main/resources/META-INF/spring.factories
index b87e618..38a7335 100644
--- a/components-starter/camel-file-watch-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-file-watch-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.file.watch.springboot.FileWatchComponentAutoConfiguration
+org.apache.camel.component.file.watch.springboot.FileWatchComponentAutoConfiguration,\
+org.apache.camel.component.file.watch.springboot.FileWatchComponentConverter
+
diff --git a/components-starter/camel-flatpack-starter/src/main/java/org/apache/camel/component/flatpack/springboot/FlatpackComponentAutoConfiguration.java b/components-starter/camel-flatpack-starter/src/main/java/org/apache/camel/component/flatpack/springboot/FlatpackComponentAutoConfiguration.java
index 690ccbe..92bd4fb 100644
--- a/components-starter/camel-flatpack-starter/src/main/java/org/apache/camel/component/flatpack/springboot/FlatpackComponentAutoConfiguration.java
+++ b/components-starter/camel-flatpack-starter/src/main/java/org/apache/camel/component/flatpack/springboot/FlatpackComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,FlatpackComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.flatpack"})
+@AutoConfigureAfter(CamelAutoConfiguration.class)
public class FlatpackComponentAutoConfiguration {
@Autowired
diff --git a/components-starter/camel-flink-starter/src/main/java/org/apache/camel/component/flink/springboot/FlinkComponentAutoConfiguration.java b/components-starter/camel-flink-starter/src/main/java/org/apache/camel/component/flink/springboot/FlinkComponentAutoConfiguration.java
index e6e1058..5c13357 100644
--- a/components-starter/camel-flink-starter/src/main/java/org/apache/camel/component/flink/springboot/FlinkComponentAutoConfiguration.java
+++ b/components-starter/camel-flink-starter/src/main/java/org/apache/camel/component/flink/springboot/FlinkComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,FlinkComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.flink"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, FlinkComponentConverter.class})
public class FlinkComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class FlinkComponentAutoConfiguration {
public FlinkComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new FlinkComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-flink-starter/src/main/java/org/apache/camel/component/flink/springboot/FlinkComponentConverter.java b/components-starter/camel-flink-starter/src/main/java/org/apache/camel/component/flink/springboot/FlinkComponentConverter.java
index 55275bf..9d322c8 100644
--- a/components-starter/camel-flink-starter/src/main/java/org/apache/camel/component/flink/springboot/FlinkComponentConverter.java
+++ b/components-starter/camel-flink-starter/src/main/java/org/apache/camel/component/flink/springboot/FlinkComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.flink.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class FlinkComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class FlinkComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public FlinkComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -58,9 +60,9 @@ public class FlinkComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "org.apache.camel.component.flink.DataSetCallback": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.flink.DataSetCallback.class);
- case "org.apache.flink.streaming.api.datastream.DataStream": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.flink.streaming.api.datastream.DataStream.class);
- case "org.apache.camel.component.flink.DataStreamCallback": return camelContext.getRegistry().lookupByNameAndType(ref, org.apache.camel.component.flink.DataStreamCallback.class);
+ case "org.apache.camel.component.flink.DataSetCallback": return applicationContext.getBean(ref, org.apache.camel.component.flink.DataSetCallback.class);
+ case "org.apache.flink.streaming.api.datastream.DataStream": return applicationContext.getBean(ref, org.apache.flink.streaming.api.datastream.DataStream.class);
+ case "org.apache.camel.component.flink.DataStreamCallback": return applicationContext.getBean(ref, org.apache.camel.component.flink.DataStreamCallback.class);
}
return null;
}
diff --git a/components-starter/camel-flink-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-flink-starter/src/main/resources/META-INF/spring.factories
index 5825db6..c88dae8 100644
--- a/components-starter/camel-flink-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-flink-starter/src/main/resources/META-INF/spring.factories
@@ -15,4 +15,6 @@
## limitations under the License.
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.flink.springboot.FlinkComponentAutoConfiguration
+org.apache.camel.component.flink.springboot.FlinkComponentAutoConfiguration,\
+org.apache.camel.component.flink.springboot.FlinkComponentConverter
+
diff --git a/components-starter/camel-fop-starter/src/main/java/org/apache/camel/component/fop/springboot/FopComponentAutoConfiguration.java b/components-starter/camel-fop-starter/src/main/java/org/apache/camel/component/fop/springboot/FopComponentAutoConfiguration.java
index ac9f41b..fc25e00 100644
--- a/components-starter/camel-fop-starter/src/main/java/org/apache/camel/component/fop/springboot/FopComponentAutoConfiguration.java
+++ b/components-starter/camel-fop-starter/src/main/java/org/apache/camel/component/fop/springboot/FopComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,FopComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.fop"})
+@AutoConfigureAfter(CamelAutoConfiguration.class)
public class FopComponentAutoConfiguration {
@Autowired
diff --git a/components-starter/camel-freemarker-starter/src/main/java/org/apache/camel/component/freemarker/springboot/FreemarkerComponentAutoConfiguration.java b/components-starter/camel-freemarker-starter/src/main/java/org/apache/camel/component/freemarker/springboot/FreemarkerComponentAutoConfiguration.java
index 0c0aefd..4af3b8a 100644
--- a/components-starter/camel-freemarker-starter/src/main/java/org/apache/camel/component/freemarker/springboot/FreemarkerComponentAutoConfiguration.java
+++ b/components-starter/camel-freemarker-starter/src/main/java/org/apache/camel/component/freemarker/springboot/FreemarkerComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,FreemarkerComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.freemarker"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, FreemarkerComponentConverter.class})
public class FreemarkerComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class FreemarkerComponentAutoConfiguration {
public FreemarkerComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new FreemarkerComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-freemarker-starter/src/main/java/org/apache/camel/component/freemarker/springboot/FreemarkerComponentConverter.java b/components-starter/camel-freemarker-starter/src/main/java/org/apache/camel/component/freemarker/springboot/FreemarkerComponentConverter.java
index 3cb9142..c4e8cf4 100644
--- a/components-starter/camel-freemarker-starter/src/main/java/org/apache/camel/component/freemarker/springboot/FreemarkerComponentConverter.java
+++ b/components-starter/camel-freemarker-starter/src/main/java/org/apache/camel/component/freemarker/springboot/FreemarkerComponentConverter.java
@@ -19,24 +19,25 @@ package org.apache.camel.component.freemarker.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class FreemarkerComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class FreemarkerComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public FreemarkerComponentConverter(
- org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
@@ -57,7 +58,7 @@ public class FreemarkerComponentConverter
}
ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
switch (targetType.getName()) {
- case "freemarker.template.Configuration": return camelContext.getRegistry().lookupByNameAndType(ref, freemarker.template.Configuration.class);
+ case "freemarker.template.Configuration": return applicationContext.getBean(ref, freemarker.template.Configuration.class);
}
return null;
}
diff --git a/components-starter/camel-freemarker-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-freemarker-starter/src/main/resources/META-INF/spring.factories
index 5879f8f..573c910 100644
--- a/components-starter/camel-freemarker-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-freemarker-starter/src/main/resources/META-INF/spring.factories
@@ -15,4 +15,6 @@
## limitations under the License.
## ---------------------------------------------------------------------------
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.freemarker.springboot.FreemarkerComponentAutoConfiguration
+org.apache.camel.component.freemarker.springboot.FreemarkerComponentAutoConfiguration,\
+org.apache.camel.component.freemarker.springboot.FreemarkerComponentConverter
+
diff --git a/components-starter/camel-ftp-starter/src/main/java/org/apache/camel/component/file/remote/springboot/FtpComponentAutoConfiguration.java b/components-starter/camel-ftp-starter/src/main/java/org/apache/camel/component/file/remote/springboot/FtpComponentAutoConfiguration.java
index c11e1cc..31f1bb2 100644
--- a/components-starter/camel-ftp-starter/src/main/java/org/apache/camel/component/file/remote/springboot/FtpComponentAutoConfiguration.java
+++ b/components-starter/camel-ftp-starter/src/main/java/org/apache/camel/component/file/remote/springboot/FtpComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,FtpComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.ftp"})
+@AutoConfigureAfter(CamelAutoConfiguration.class)
public class FtpComponentAutoConfiguration {
@Autowired
diff --git a/components-starter/camel-ftp-starter/src/main/java/org/apache/camel/component/file/remote/springboot/FtpsComponentAutoConfiguration.java b/components-starter/camel-ftp-starter/src/main/java/org/apache/camel/component/file/remote/springboot/FtpsComponentAutoConfiguration.java
index 2935a08..f93b164 100644
--- a/components-starter/camel-ftp-starter/src/main/java/org/apache/camel/component/file/remote/springboot/FtpsComponentAutoConfiguration.java
+++ b/components-starter/camel-ftp-starter/src/main/java/org/apache/camel/component/file/remote/springboot/FtpsComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,FtpsComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.ftps"})
+@AutoConfigureAfter(CamelAutoConfiguration.class)
public class FtpsComponentAutoConfiguration {
@Autowired
diff --git a/components-starter/camel-ftp-starter/src/main/java/org/apache/camel/component/file/remote/springboot/SftpComponentAutoConfiguration.java b/components-starter/camel-ftp-starter/src/main/java/org/apache/camel/component/file/remote/springboot/SftpComponentAutoConfiguration.java
index 951e027..9e2a1fe 100644
--- a/components-starter/camel-ftp-starter/src/main/java/org/apache/camel/component/file/remote/springboot/SftpComponentAutoConfiguration.java
+++ b/components-starter/camel-ftp-starter/src/main/java/org/apache/camel/component/file/remote/springboot/SftpComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,SftpComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.sftp"})
+@AutoConfigureAfter(CamelAutoConfiguration.class)
public class SftpComponentAutoConfiguration {
@Autowired
diff --git a/components-starter/camel-ganglia-starter/src/main/java/org/apache/camel/component/ganglia/springboot/GangliaComponentAutoConfiguration.java b/components-starter/camel-ganglia-starter/src/main/java/org/apache/camel/component/ganglia/springboot/GangliaComponentAutoConfiguration.java
index af1cb57..473d195 100644
--- a/components-starter/camel-ganglia-starter/src/main/java/org/apache/camel/component/ganglia/springboot/GangliaComponentAutoConfiguration.java
+++ b/components-starter/camel-ganglia-starter/src/main/java/org/apache/camel/component/ganglia/springboot/GangliaComponentAutoConfiguration.java
@@ -30,7 +30,6 @@ import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.convert.ApplicationConversionService;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
@@ -42,10 +41,10 @@ import org.springframework.context.annotation.Lazy;
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
@Configuration(proxyBeanMethods = false)
-@AutoConfigureAfter(CamelAutoConfiguration.class)
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,GangliaComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.ganglia"})
+@AutoConfigureAfter({CamelAutoConfiguration.class, GangliaComponentConverter.class})
public class GangliaComponentAutoConfiguration {
@Autowired
@@ -57,8 +56,6 @@ public class GangliaComponentAutoConfiguration {
public GangliaComponentAutoConfiguration(
org.apache.camel.CamelContext camelContext) {
this.camelContext = camelContext;
- ApplicationConversionService acs = (ApplicationConversionService) ApplicationConversionService.getSharedInstance();
- acs.addConverter(new GangliaComponentConverter(camelContext));
}
@Lazy
diff --git a/components-starter/camel-ganglia-starter/src/main/java/org/apache/camel/component/ganglia/springboot/GangliaComponentConverter.java b/components-starter/camel-ganglia-starter/src/main/java/org/apache/camel/component/ganglia/springboot/GangliaComponentConverter.java
index 22d2256..3ff4863 100644
--- a/components-starter/camel-ganglia-starter/src/main/java/org/apache/camel/component/ganglia/springboot/GangliaComponentConverter.java
+++ b/components-starter/camel-ganglia-starter/src/main/java/org/apache/camel/component/ganglia/springboot/GangliaComponentConverter.java
@@ -19,23 +19,25 @@ package org.apache.camel.component.ganglia.springboot;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
/**
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-public class GangliaComponentConverter
- implements
- org.springframework.core.convert.converter.GenericConverter {
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class GangliaComponentConverter implements GenericConverter {
- private final CamelContext camelContext;
-
- public GangliaComponentConverter(org.apache.camel.CamelContext camelContext) {
- this.camelContext = camelContext;
- }
+ @Autowired
+ private ApplicationContext applicationContext;
public Set<ConvertiblePair> getConvertibleTypes() {
... 14023 lines suppressed ...