CAMEL-10412: Camel Spring Boot auto configuration depends on bean CamelAutoConfiguration which makes it easier to turn Camel autoconfiguration off when writing tests.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d8edc022 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d8edc022 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d8edc022 Branch: refs/heads/master Commit: d8edc022a4a95bc664a3aab2d4ffc49b043c39ae Parents: 7693b4c Author: Claus Ibsen <davscl...@apache.org> Authored: Sat Oct 29 21:26:54 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sat Oct 29 21:26:54 2016 +0200 ---------------------------------------------------------------------- .../component/ahc/springboot/AhcComponentAutoConfiguration.java | 2 ++ .../ahc/ws/springboot/WsComponentAutoConfiguration.java | 2 ++ .../amqp/springboot/AMQPComponentAutoConfiguration.java | 2 ++ .../apns/springboot/ApnsComponentAutoConfiguration.java | 2 ++ .../springboot/WebsocketComponentAutoConfiguration.java | 2 ++ .../avro/springboot/AvroComponentAutoConfiguration.java | 2 ++ .../avro/springboot/AvroDataFormatAutoConfiguration.java | 2 ++ .../barcode/springboot/BarcodeDataFormatAutoConfiguration.java | 2 ++ .../base64/springboot/Base64DataFormatAutoConfiguration.java | 2 ++ .../beanio/springboot/BeanIODataFormatAutoConfiguration.java | 2 ++ .../springboot/BeanstalkComponentAutoConfiguration.java | 2 ++ .../csv/springboot/BindyCsvDataFormatAutoConfiguration.java | 2 ++ .../springboot/BindyFixedLengthDataFormatAutoConfiguration.java | 2 ++ .../springboot/BindyKeyValuePairDataFormatAutoConfiguration.java | 2 ++ .../boon/springboot/BoonDataFormatAutoConfiguration.java | 2 ++ .../component/box/springboot/BoxComponentAutoConfiguration.java | 2 ++ .../springboot/BraintreeComponentAutoConfiguration.java | 2 ++ .../cache/springboot/CacheComponentAutoConfiguration.java | 2 ++ .../castor/springboot/CastorDataFormatAutoConfiguration.java | 2 ++ .../cometd/springboot/CometdComponentAutoConfiguration.java | 2 ++ .../direct/springboot/DirectComponentAutoConfiguration.java | 2 ++ .../directvm/springboot/DirectVmComponentAutoConfiguration.java | 2 ++ .../component/log/springboot/LogComponentAutoConfiguration.java | 2 ++ .../springboot/PropertiesComponentAutoConfiguration.java | 2 ++ .../rest/springboot/RestComponentAutoConfiguration.java | 2 ++ .../springboot/SchedulerComponentAutoConfiguration.java | 2 ++ .../seda/springboot/SedaComponentAutoConfiguration.java | 2 ++ .../stub/springboot/StubComponentAutoConfiguration.java | 2 ++ .../springboot/ValidatorComponentAutoConfiguration.java | 2 ++ .../component/vm/springboot/VmComponentAutoConfiguration.java | 2 ++ .../xslt/springboot/XsltComponentAutoConfiguration.java | 2 ++ .../camel/impl/springboot/GzipDataFormatAutoConfiguration.java | 2 ++ .../springboot/SerializationDataFormatAutoConfiguration.java | 2 ++ .../camel/impl/springboot/StringDataFormatAutoConfiguration.java | 2 ++ .../camel/impl/springboot/ZipDataFormatAutoConfiguration.java | 2 ++ .../language/bean/springboot/BeanLanguageAutoConfiguration.java | 2 ++ .../constant/springboot/ConstantLanguageAutoConfiguration.java | 2 ++ .../header/springboot/HeaderLanguageAutoConfiguration.java | 2 ++ .../springboot/ExchangePropertyLanguageAutoConfiguration.java | 2 ++ .../language/ref/springboot/RefLanguageAutoConfiguration.java | 2 ++ .../simple/springboot/FileLanguageAutoConfiguration.java | 2 ++ .../simple/springboot/SimpleLanguageAutoConfiguration.java | 2 ++ .../tokenizer/springboot/TokenizeLanguageAutoConfiguration.java | 2 ++ .../springboot/XMLTokenizeLanguageAutoConfiguration.java | 2 ++ .../xpath/springboot/XPathLanguageAutoConfiguration.java | 2 ++ .../springboot/DigitalSignatureComponentAutoConfiguration.java | 2 ++ .../crypto/springboot/CryptoDataFormatAutoConfiguration.java | 2 ++ .../crypto/springboot/PGPDataFormatAutoConfiguration.java | 2 ++ .../csv/springboot/CsvDataFormatAutoConfiguration.java | 2 ++ .../cxf/jaxrs/springboot/CxfRsComponentAutoConfiguration.java | 2 ++ .../component/cxf/springboot/CxfComponentAutoConfiguration.java | 2 ++ .../springboot/DisruptorComponentAutoConfiguration.java | 2 ++ .../vm/springboot/DisruptorVmComponentAutoConfiguration.java | 2 ++ .../docker/springboot/DockerComponentAutoConfiguration.java | 2 ++ .../springboot/ElasticsearchComponentAutoConfiguration.java | 2 ++ .../elsql/springboot/ElsqlComponentAutoConfiguration.java | 2 ++ .../facebook/springboot/FacebookComponentAutoConfiguration.java | 2 ++ .../flatpack/springboot/FlatpackDataFormatAutoConfiguration.java | 2 ++ .../flink/springboot/FlinkComponentAutoConfiguration.java | 2 ++ .../springboot/FreemarkerComponentAutoConfiguration.java | 2 ++ .../ganglia/springboot/GangliaComponentAutoConfiguration.java | 2 ++ .../springboot/GoogleCalendarComponentAutoConfiguration.java | 2 ++ .../drive/springboot/GoogleDriveComponentAutoConfiguration.java | 2 ++ .../mail/springboot/GoogleMailComponentAutoConfiguration.java | 2 ++ .../groovy/springboot/GroovyLanguageAutoConfiguration.java | 2 ++ .../gson/springboot/GsonDataFormatAutoConfiguration.java | 2 ++ .../springboot/GuavaEventBusComponentAutoConfiguration.java | 2 ++ .../springboot/HazelcastComponentAutoConfiguration.java | 2 ++ .../hbase/springboot/HBaseComponentAutoConfiguration.java | 2 ++ .../hdfs/springboot/HdfsComponentAutoConfiguration.java | 2 ++ .../hdfs2/springboot/HdfsComponentAutoConfiguration.java | 2 ++ .../hessian/springboot/HessianDataFormatAutoConfiguration.java | 2 ++ .../component/hl7/springboot/HL7DataFormatAutoConfiguration.java | 2 ++ .../hl7/springboot/TerserLanguageAutoConfiguration.java | 2 ++ .../http/springboot/HttpComponentAutoConfiguration.java | 2 ++ .../http4/springboot/HttpComponentAutoConfiguration.java | 2 ++ .../ical/springboot/ICalDataFormatAutoConfiguration.java | 2 ++ .../jackson/springboot/JacksonDataFormatAutoConfiguration.java | 2 ++ .../springboot/JacksonXMLDataFormatAutoConfiguration.java | 2 ++ .../jaxb/springboot/JaxbDataFormatAutoConfiguration.java | 2 ++ .../jdbc/springboot/JdbcComponentAutoConfiguration.java | 2 ++ .../jetty9/springboot/JettyHttpComponentAutoConfiguration9.java | 2 ++ .../jgroups/springboot/JGroupsComponentAutoConfiguration.java | 2 ++ .../jibx/springboot/JibxDataFormatAutoConfiguration.java | 2 ++ .../component/jms/springboot/JmsComponentAutoConfiguration.java | 2 ++ .../johnzon/springboot/JohnzonDataFormatAutoConfiguration.java | 2 ++ .../jolt/springboot/JoltComponentAutoConfiguration.java | 2 ++ .../language/sql/springboot/SqlLanguageAutoConfiguration.java | 2 ++ .../component/jpa/springboot/JpaComponentAutoConfiguration.java | 2 ++ .../component/scp/springboot/ScpComponentAutoConfiguration.java | 2 ++ .../jsonpath/springboot/JsonPathLanguageAutoConfiguration.java | 2 ++ .../jt400/springboot/Jt400ComponentAutoConfiguration.java | 2 ++ .../language/juel/springboot/JuelLanguageAutoConfiguration.java | 2 ++ .../jxpath/springboot/JXPathLanguageAutoConfiguration.java | 2 ++ .../kafka/springboot/KafkaComponentAutoConfiguration.java | 2 ++ .../kestrel/springboot/KestrelComponentAutoConfiguration.java | 2 ++ .../linkedin/springboot/LinkedInComponentAutoConfiguration.java | 2 ++ .../lucene/springboot/LuceneComponentAutoConfiguration.java | 2 ++ .../springboot/LumberjackComponentAutoConfiguration.java | 2 ++ .../lzf/springboot/LZFDataFormatAutoConfiguration.java | 2 ++ .../mail/springboot/MailComponentAutoConfiguration.java | 2 ++ .../springboot/MimeMultipartDataFormatAutoConfiguration.java | 2 ++ .../metrics/springboot/MetricsComponentAutoConfiguration.java | 2 ++ .../mina2/springboot/Mina2ComponentAutoConfiguration.java | 2 ++ .../mqtt/springboot/MQTTComponentAutoConfiguration.java | 2 ++ .../validator/msv/springboot/MsvComponentAutoConfiguration.java | 2 ++ .../mustache/springboot/MustacheComponentAutoConfiguration.java | 2 ++ .../language/mvel/springboot/MvelLanguageAutoConfiguration.java | 2 ++ .../mybatis/springboot/MyBatisComponentAutoConfiguration.java | 2 ++ .../nagios/springboot/NagiosComponentAutoConfiguration.java | 2 ++ .../http/springboot/NettyHttpComponentAutoConfiguration.java | 2 ++ .../netty/springboot/NettyComponentAutoConfiguration.java | 2 ++ .../http/springboot/NettyHttpComponentAutoConfiguration.java | 2 ++ .../netty4/springboot/NettyComponentAutoConfiguration.java | 2 ++ .../language/ognl/springboot/OgnlLanguageAutoConfiguration.java | 2 ++ .../olingo2/springboot/Olingo2ComponentAutoConfiguration.java | 2 ++ .../springboot/OpenShiftComponentAutoConfiguration.java | 2 ++ .../paho/springboot/PahoComponentAutoConfiguration.java | 2 ++ .../protobuf/springboot/ProtobufDataFormatAutoConfiguration.java | 2 ++ .../quartz2/springboot/QuartzComponentAutoConfiguration.java | 2 ++ .../springboot/QuickfixjComponentAutoConfiguration.java | 2 ++ .../restlet/springboot/RestletComponentAutoConfiguration.java | 2 ++ .../rss/springboot/RssDataFormatAutoConfiguration.java | 2 ++ .../springboot/SalesforceComponentAutoConfiguration.java | 2 ++ .../xquery/springboot/XQueryComponentAutoConfiguration.java | 2 ++ .../xquery/springboot/XQueryLanguageAutoConfiguration.java | 2 ++ .../script/springboot/JavaScriptLanguageAutoConfiguration.java | 2 ++ .../builder/script/springboot/PhpLanguageAutoConfiguration.java | 2 ++ .../script/springboot/PythonLanguageAutoConfiguration.java | 2 ++ .../builder/script/springboot/RubyLanguageAutoConfiguration.java | 2 ++ .../springboot/ServiceNowComponentAutoConfiguration.java | 2 ++ .../servlet/springboot/ServletComponentAutoConfiguration.java | 2 ++ .../batch/springboot/SjmsBatchComponentAutoConfiguration.java | 2 ++ .../sjms/springboot/SjmsComponentAutoConfiguration.java | 2 ++ .../slack/springboot/SlackComponentAutoConfiguration.java | 2 ++ .../smpp/springboot/SmppComponentAutoConfiguration.java | 2 ++ .../springboot/SnakeYAMLDataFormatAutoConfiguration.java | 2 ++ .../soap/springboot/SoapJaxbDataFormatAutoConfiguration.java | 2 ++ .../spark/springboot/SparkComponentAutoConfiguration.java | 2 ++ .../splunk/springboot/SplunkComponentAutoConfiguration.java | 2 ++ .../batch/springboot/SpringBatchComponentAutoConfiguration.java | 2 ++ .../event/springboot/EventComponentAutoConfiguration.java | 2 ++ .../language/spel/springboot/SpelLanguageAutoConfiguration.java | 2 ++ .../component/sql/springboot/SqlComponentAutoConfiguration.java | 2 ++ .../stored/springboot/SqlStoredComponentAutoConfiguration.java | 2 ++ .../component/ssh/springboot/SshComponentAutoConfiguration.java | 2 ++ .../stomp/springboot/StompComponentAutoConfiguration.java | 2 ++ .../syslog/springboot/SyslogDataFormatAutoConfiguration.java | 2 ++ .../springboot/TidyMarkupDataFormatAutoConfiguration.java | 2 ++ .../tarfile/springboot/TarFileDataFormatAutoConfiguration.java | 2 ++ .../telegram/springboot/TelegramComponentAutoConfiguration.java | 2 ++ .../twitter/springboot/TwitterComponentAutoConfiguration.java | 2 ++ .../undertow/springboot/UndertowComponentAutoConfiguration.java | 2 ++ .../springboot/UniVocityCsvDataFormatAutoConfiguration.java | 2 ++ .../UniVocityFixedWidthDataFormatAutoConfiguration.java | 2 ++ .../springboot/UniVocityTsvDataFormatAutoConfiguration.java | 2 ++ .../velocity/springboot/VelocityComponentAutoConfiguration.java | 2 ++ .../vertx/springboot/VertxComponentAutoConfiguration.java | 2 ++ .../springboot/WebsocketComponentAutoConfiguration.java | 2 ++ .../xmlbeans/springboot/XmlBeansDataFormatAutoConfiguration.java | 2 ++ .../xmljson/springboot/XmlJsonDataFormatAutoConfiguration.java | 2 ++ .../xmlrpc/springboot/XmlRpcDataFormatAutoConfiguration.java | 2 ++ .../springboot/XmlSignatureComponentAutoConfiguration.java | 2 ++ .../springboot/XMLSecurityDataFormatAutoConfiguration.java | 2 ++ .../xstream/springboot/JsonDataFormatAutoConfiguration.java | 2 ++ .../xstream/springboot/XStreamDataFormatAutoConfiguration.java | 2 ++ .../yammer/springboot/YammerComponentAutoConfiguration.java | 2 ++ .../zipfile/springboot/ZipFileDataFormatAutoConfiguration.java | 2 ++ .../springboot/ZooKeeperComponentAutoConfiguration.java | 2 ++ .../camel/maven/packaging/SpringBootAutoConfigurationMojo.java | 4 ++++ 170 files changed, 342 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/d8edc022/components-starter/camel-ahc-starter/src/main/java/org/apache/camel/component/ahc/springboot/AhcComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-ahc-starter/src/main/java/org/apache/camel/component/ahc/springboot/AhcComponentAutoConfiguration.java b/components-starter/camel-ahc-starter/src/main/java/org/apache/camel/component/ahc/springboot/AhcComponentAutoConfiguration.java index e226da5..50bfecb 100644 --- a/components-starter/camel-ahc-starter/src/main/java/org/apache/camel/component/ahc/springboot/AhcComponentAutoConfiguration.java +++ b/components-starter/camel-ahc-starter/src/main/java/org/apache/camel/component/ahc/springboot/AhcComponentAutoConfiguration.java @@ -21,6 +21,7 @@ import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.component.ahc.AhcComponent; import org.apache.camel.util.IntrospectionSupport; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -31,6 +32,7 @@ import org.springframework.context.annotation.Configuration; * Generated by camel-package-maven-plugin - do not edit this file! */ @Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") @EnableConfigurationProperties(AhcComponentConfiguration.class) public class AhcComponentAutoConfiguration { http://git-wip-us.apache.org/repos/asf/camel/blob/d8edc022/components-starter/camel-ahc-ws-starter/src/main/java/org/apache/camel/component/ahc/ws/springboot/WsComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-ahc-ws-starter/src/main/java/org/apache/camel/component/ahc/ws/springboot/WsComponentAutoConfiguration.java b/components-starter/camel-ahc-ws-starter/src/main/java/org/apache/camel/component/ahc/ws/springboot/WsComponentAutoConfiguration.java index 97427fd..2161cd7 100644 --- a/components-starter/camel-ahc-ws-starter/src/main/java/org/apache/camel/component/ahc/ws/springboot/WsComponentAutoConfiguration.java +++ b/components-starter/camel-ahc-ws-starter/src/main/java/org/apache/camel/component/ahc/ws/springboot/WsComponentAutoConfiguration.java @@ -21,6 +21,7 @@ import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.component.ahc.ws.WsComponent; import org.apache.camel.util.IntrospectionSupport; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -31,6 +32,7 @@ import org.springframework.context.annotation.Configuration; * Generated by camel-package-maven-plugin - do not edit this file! */ @Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") @EnableConfigurationProperties(WsComponentConfiguration.class) public class WsComponentAutoConfiguration { http://git-wip-us.apache.org/repos/asf/camel/blob/d8edc022/components-starter/camel-amqp-starter/src/main/java/org/apache/camel/component/amqp/springboot/AMQPComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-amqp-starter/src/main/java/org/apache/camel/component/amqp/springboot/AMQPComponentAutoConfiguration.java b/components-starter/camel-amqp-starter/src/main/java/org/apache/camel/component/amqp/springboot/AMQPComponentAutoConfiguration.java index 6da1448..e5fa2b5 100644 --- a/components-starter/camel-amqp-starter/src/main/java/org/apache/camel/component/amqp/springboot/AMQPComponentAutoConfiguration.java +++ b/components-starter/camel-amqp-starter/src/main/java/org/apache/camel/component/amqp/springboot/AMQPComponentAutoConfiguration.java @@ -21,6 +21,7 @@ import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.component.amqp.AMQPComponent; import org.apache.camel.util.IntrospectionSupport; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -31,6 +32,7 @@ import org.springframework.context.annotation.Configuration; * Generated by camel-package-maven-plugin - do not edit this file! */ @Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") @EnableConfigurationProperties(AMQPComponentConfiguration.class) public class AMQPComponentAutoConfiguration { http://git-wip-us.apache.org/repos/asf/camel/blob/d8edc022/components-starter/camel-apns-starter/src/main/java/org/apache/camel/component/apns/springboot/ApnsComponentAutoConfiguration.java ---------------------------------------------------------------------- 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 7d623dc..d79649c 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 @@ -21,6 +21,7 @@ import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.component.apns.ApnsComponent; import org.apache.camel.util.IntrospectionSupport; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -31,6 +32,7 @@ import org.springframework.context.annotation.Configuration; * Generated by camel-package-maven-plugin - do not edit this file! */ @Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") @EnableConfigurationProperties(ApnsComponentConfiguration.class) public class ApnsComponentAutoConfiguration { http://git-wip-us.apache.org/repos/asf/camel/blob/d8edc022/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentAutoConfiguration.java ---------------------------------------------------------------------- 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 8ca721c..71aa922 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 @@ -21,6 +21,7 @@ import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.component.atmosphere.websocket.WebsocketComponent; import org.apache.camel.util.IntrospectionSupport; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -31,6 +32,7 @@ import org.springframework.context.annotation.Configuration; * Generated by camel-package-maven-plugin - do not edit this file! */ @Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") @EnableConfigurationProperties(WebsocketComponentConfiguration.class) public class WebsocketComponentAutoConfiguration { http://git-wip-us.apache.org/repos/asf/camel/blob/d8edc022/components-starter/camel-avro-starter/src/main/java/org/apache/camel/component/avro/springboot/AvroComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-avro-starter/src/main/java/org/apache/camel/component/avro/springboot/AvroComponentAutoConfiguration.java b/components-starter/camel-avro-starter/src/main/java/org/apache/camel/component/avro/springboot/AvroComponentAutoConfiguration.java index 9a10743..05ed7ae 100644 --- a/components-starter/camel-avro-starter/src/main/java/org/apache/camel/component/avro/springboot/AvroComponentAutoConfiguration.java +++ b/components-starter/camel-avro-starter/src/main/java/org/apache/camel/component/avro/springboot/AvroComponentAutoConfiguration.java @@ -21,6 +21,7 @@ import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.component.avro.AvroComponent; import org.apache.camel.util.IntrospectionSupport; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -31,6 +32,7 @@ import org.springframework.context.annotation.Configuration; * Generated by camel-package-maven-plugin - do not edit this file! */ @Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") @EnableConfigurationProperties(AvroComponentConfiguration.class) public class AvroComponentAutoConfiguration { http://git-wip-us.apache.org/repos/asf/camel/blob/d8edc022/components-starter/camel-avro-starter/src/main/java/org/apache/camel/dataformat/avro/springboot/AvroDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-avro-starter/src/main/java/org/apache/camel/dataformat/avro/springboot/AvroDataFormatAutoConfiguration.java b/components-starter/camel-avro-starter/src/main/java/org/apache/camel/dataformat/avro/springboot/AvroDataFormatAutoConfiguration.java index 9d744ea..05cc18a 100644 --- a/components-starter/camel-avro-starter/src/main/java/org/apache/camel/dataformat/avro/springboot/AvroDataFormatAutoConfiguration.java +++ b/components-starter/camel-avro-starter/src/main/java/org/apache/camel/dataformat/avro/springboot/AvroDataFormatAutoConfiguration.java @@ -22,6 +22,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; import org.apache.camel.dataformat.avro.AvroDataFormat; import org.apache.camel.util.IntrospectionSupport; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -32,6 +33,7 @@ import org.springframework.context.annotation.Configuration; * Generated by camel-package-maven-plugin - do not edit this file! */ @Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") @EnableConfigurationProperties(AvroDataFormatConfiguration.class) public class AvroDataFormatAutoConfiguration { http://git-wip-us.apache.org/repos/asf/camel/blob/d8edc022/components-starter/camel-barcode-starter/src/main/java/org/apache/camel/dataformat/barcode/springboot/BarcodeDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-barcode-starter/src/main/java/org/apache/camel/dataformat/barcode/springboot/BarcodeDataFormatAutoConfiguration.java b/components-starter/camel-barcode-starter/src/main/java/org/apache/camel/dataformat/barcode/springboot/BarcodeDataFormatAutoConfiguration.java index c865566..a1d21d4 100644 --- a/components-starter/camel-barcode-starter/src/main/java/org/apache/camel/dataformat/barcode/springboot/BarcodeDataFormatAutoConfiguration.java +++ b/components-starter/camel-barcode-starter/src/main/java/org/apache/camel/dataformat/barcode/springboot/BarcodeDataFormatAutoConfiguration.java @@ -22,6 +22,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; import org.apache.camel.dataformat.barcode.BarcodeDataFormat; import org.apache.camel.util.IntrospectionSupport; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -32,6 +33,7 @@ import org.springframework.context.annotation.Configuration; * Generated by camel-package-maven-plugin - do not edit this file! */ @Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") @EnableConfigurationProperties(BarcodeDataFormatConfiguration.class) public class BarcodeDataFormatAutoConfiguration { http://git-wip-us.apache.org/repos/asf/camel/blob/d8edc022/components-starter/camel-base64-starter/src/main/java/org/apache/camel/dataformat/base64/springboot/Base64DataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-base64-starter/src/main/java/org/apache/camel/dataformat/base64/springboot/Base64DataFormatAutoConfiguration.java b/components-starter/camel-base64-starter/src/main/java/org/apache/camel/dataformat/base64/springboot/Base64DataFormatAutoConfiguration.java index 204efb2..cc12588 100644 --- a/components-starter/camel-base64-starter/src/main/java/org/apache/camel/dataformat/base64/springboot/Base64DataFormatAutoConfiguration.java +++ b/components-starter/camel-base64-starter/src/main/java/org/apache/camel/dataformat/base64/springboot/Base64DataFormatAutoConfiguration.java @@ -22,6 +22,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; import org.apache.camel.dataformat.base64.Base64DataFormat; import org.apache.camel.util.IntrospectionSupport; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -32,6 +33,7 @@ import org.springframework.context.annotation.Configuration; * Generated by camel-package-maven-plugin - do not edit this file! */ @Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") @EnableConfigurationProperties(Base64DataFormatConfiguration.class) public class Base64DataFormatAutoConfiguration { http://git-wip-us.apache.org/repos/asf/camel/blob/d8edc022/components-starter/camel-beanio-starter/src/main/java/org/apache/camel/dataformat/beanio/springboot/BeanIODataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-beanio-starter/src/main/java/org/apache/camel/dataformat/beanio/springboot/BeanIODataFormatAutoConfiguration.java b/components-starter/camel-beanio-starter/src/main/java/org/apache/camel/dataformat/beanio/springboot/BeanIODataFormatAutoConfiguration.java index 00121a8..02ae9ef 100644 --- a/components-starter/camel-beanio-starter/src/main/java/org/apache/camel/dataformat/beanio/springboot/BeanIODataFormatAutoConfiguration.java +++ b/components-starter/camel-beanio-starter/src/main/java/org/apache/camel/dataformat/beanio/springboot/BeanIODataFormatAutoConfiguration.java @@ -22,6 +22,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; import org.apache.camel.dataformat.beanio.BeanIODataFormat; import org.apache.camel.util.IntrospectionSupport; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -32,6 +33,7 @@ import org.springframework.context.annotation.Configuration; * Generated by camel-package-maven-plugin - do not edit this file! */ @Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") @EnableConfigurationProperties(BeanIODataFormatConfiguration.class) public class BeanIODataFormatAutoConfiguration { http://git-wip-us.apache.org/repos/asf/camel/blob/d8edc022/components-starter/camel-beanstalk-starter/src/main/java/org/apache/camel/component/beanstalk/springboot/BeanstalkComponentAutoConfiguration.java ---------------------------------------------------------------------- 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 b0cdb93..9b5049b 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 @@ -21,6 +21,7 @@ import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.component.beanstalk.BeanstalkComponent; import org.apache.camel.util.IntrospectionSupport; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -31,6 +32,7 @@ import org.springframework.context.annotation.Configuration; * Generated by camel-package-maven-plugin - do not edit this file! */ @Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") @EnableConfigurationProperties(BeanstalkComponentConfiguration.class) public class BeanstalkComponentAutoConfiguration { http://git-wip-us.apache.org/repos/asf/camel/blob/d8edc022/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/csv/springboot/BindyCsvDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/csv/springboot/BindyCsvDataFormatAutoConfiguration.java b/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/csv/springboot/BindyCsvDataFormatAutoConfiguration.java index 5126a88..c2218da 100644 --- a/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/csv/springboot/BindyCsvDataFormatAutoConfiguration.java +++ b/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/csv/springboot/BindyCsvDataFormatAutoConfiguration.java @@ -22,6 +22,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; import org.apache.camel.dataformat.bindy.csv.BindyCsvDataFormat; import org.apache.camel.util.IntrospectionSupport; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -32,6 +33,7 @@ import org.springframework.context.annotation.Configuration; * Generated by camel-package-maven-plugin - do not edit this file! */ @Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") @EnableConfigurationProperties(BindyCsvDataFormatConfiguration.class) public class BindyCsvDataFormatAutoConfiguration { http://git-wip-us.apache.org/repos/asf/camel/blob/d8edc022/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/fixed/springboot/BindyFixedLengthDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/fixed/springboot/BindyFixedLengthDataFormatAutoConfiguration.java b/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/fixed/springboot/BindyFixedLengthDataFormatAutoConfiguration.java index b29c731..556db4f 100644 --- a/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/fixed/springboot/BindyFixedLengthDataFormatAutoConfiguration.java +++ b/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/fixed/springboot/BindyFixedLengthDataFormatAutoConfiguration.java @@ -22,6 +22,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; import org.apache.camel.dataformat.bindy.fixed.BindyFixedLengthDataFormat; import org.apache.camel.util.IntrospectionSupport; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -32,6 +33,7 @@ import org.springframework.context.annotation.Configuration; * Generated by camel-package-maven-plugin - do not edit this file! */ @Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") @EnableConfigurationProperties(BindyFixedLengthDataFormatConfiguration.class) public class BindyFixedLengthDataFormatAutoConfiguration { http://git-wip-us.apache.org/repos/asf/camel/blob/d8edc022/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/kvp/springboot/BindyKeyValuePairDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/kvp/springboot/BindyKeyValuePairDataFormatAutoConfiguration.java b/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/kvp/springboot/BindyKeyValuePairDataFormatAutoConfiguration.java index e2a986f..d6427eb 100644 --- a/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/kvp/springboot/BindyKeyValuePairDataFormatAutoConfiguration.java +++ b/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/kvp/springboot/BindyKeyValuePairDataFormatAutoConfiguration.java @@ -22,6 +22,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; import org.apache.camel.dataformat.bindy.kvp.BindyKeyValuePairDataFormat; import org.apache.camel.util.IntrospectionSupport; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -32,6 +33,7 @@ import org.springframework.context.annotation.Configuration; * Generated by camel-package-maven-plugin - do not edit this file! */ @Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") @EnableConfigurationProperties(BindyKeyValuePairDataFormatConfiguration.class) public class BindyKeyValuePairDataFormatAutoConfiguration { http://git-wip-us.apache.org/repos/asf/camel/blob/d8edc022/components-starter/camel-boon-starter/src/main/java/org/apache/camel/component/boon/springboot/BoonDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-boon-starter/src/main/java/org/apache/camel/component/boon/springboot/BoonDataFormatAutoConfiguration.java b/components-starter/camel-boon-starter/src/main/java/org/apache/camel/component/boon/springboot/BoonDataFormatAutoConfiguration.java index 36afa5b..2caf46b 100644 --- a/components-starter/camel-boon-starter/src/main/java/org/apache/camel/component/boon/springboot/BoonDataFormatAutoConfiguration.java +++ b/components-starter/camel-boon-starter/src/main/java/org/apache/camel/component/boon/springboot/BoonDataFormatAutoConfiguration.java @@ -22,6 +22,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; import org.apache.camel.component.boon.BoonDataFormat; import org.apache.camel.util.IntrospectionSupport; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -32,6 +33,7 @@ import org.springframework.context.annotation.Configuration; * Generated by camel-package-maven-plugin - do not edit this file! */ @Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") @EnableConfigurationProperties(BoonDataFormatConfiguration.class) public class BoonDataFormatAutoConfiguration { http://git-wip-us.apache.org/repos/asf/camel/blob/d8edc022/components-starter/camel-box-starter/src/main/java/org/apache/camel/component/box/springboot/BoxComponentAutoConfiguration.java ---------------------------------------------------------------------- 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 efd45ed..339b3ff 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 @@ -21,6 +21,7 @@ import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.component.box.BoxComponent; import org.apache.camel.util.IntrospectionSupport; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -31,6 +32,7 @@ import org.springframework.context.annotation.Configuration; * Generated by camel-package-maven-plugin - do not edit this file! */ @Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") @EnableConfigurationProperties(BoxComponentConfiguration.class) public class BoxComponentAutoConfiguration { http://git-wip-us.apache.org/repos/asf/camel/blob/d8edc022/components-starter/camel-braintree-starter/src/main/java/org/apache/camel/component/braintree/springboot/BraintreeComponentAutoConfiguration.java ---------------------------------------------------------------------- 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 50aa4ba..977f692 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 @@ -21,6 +21,7 @@ import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.component.braintree.BraintreeComponent; import org.apache.camel.util.IntrospectionSupport; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -31,6 +32,7 @@ import org.springframework.context.annotation.Configuration; * Generated by camel-package-maven-plugin - do not edit this file! */ @Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") @EnableConfigurationProperties(BraintreeComponentConfiguration.class) public class BraintreeComponentAutoConfiguration { http://git-wip-us.apache.org/repos/asf/camel/blob/d8edc022/components-starter/camel-cache-starter/src/main/java/org/apache/camel/component/cache/springboot/CacheComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-cache-starter/src/main/java/org/apache/camel/component/cache/springboot/CacheComponentAutoConfiguration.java b/components-starter/camel-cache-starter/src/main/java/org/apache/camel/component/cache/springboot/CacheComponentAutoConfiguration.java index 3ff3096..df6c488 100644 --- a/components-starter/camel-cache-starter/src/main/java/org/apache/camel/component/cache/springboot/CacheComponentAutoConfiguration.java +++ b/components-starter/camel-cache-starter/src/main/java/org/apache/camel/component/cache/springboot/CacheComponentAutoConfiguration.java @@ -21,6 +21,7 @@ import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.component.cache.CacheComponent; import org.apache.camel.util.IntrospectionSupport; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -31,6 +32,7 @@ import org.springframework.context.annotation.Configuration; * Generated by camel-package-maven-plugin - do not edit this file! */ @Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") @EnableConfigurationProperties(CacheComponentConfiguration.class) public class CacheComponentAutoConfiguration { http://git-wip-us.apache.org/repos/asf/camel/blob/d8edc022/components-starter/camel-castor-starter/src/main/java/org/apache/camel/dataformat/castor/springboot/CastorDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-castor-starter/src/main/java/org/apache/camel/dataformat/castor/springboot/CastorDataFormatAutoConfiguration.java b/components-starter/camel-castor-starter/src/main/java/org/apache/camel/dataformat/castor/springboot/CastorDataFormatAutoConfiguration.java index f7bb885..30072d7 100644 --- a/components-starter/camel-castor-starter/src/main/java/org/apache/camel/dataformat/castor/springboot/CastorDataFormatAutoConfiguration.java +++ b/components-starter/camel-castor-starter/src/main/java/org/apache/camel/dataformat/castor/springboot/CastorDataFormatAutoConfiguration.java @@ -22,6 +22,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; import org.apache.camel.dataformat.castor.CastorDataFormat; import org.apache.camel.util.IntrospectionSupport; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -32,6 +33,7 @@ import org.springframework.context.annotation.Configuration; * Generated by camel-package-maven-plugin - do not edit this file! */ @Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") @EnableConfigurationProperties(CastorDataFormatConfiguration.class) public class CastorDataFormatAutoConfiguration { http://git-wip-us.apache.org/repos/asf/camel/blob/d8edc022/components-starter/camel-cometd-starter/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentAutoConfiguration.java ---------------------------------------------------------------------- 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 87080c6..b4944ae 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 @@ -21,6 +21,7 @@ import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.component.cometd.CometdComponent; import org.apache.camel.util.IntrospectionSupport; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -31,6 +32,7 @@ import org.springframework.context.annotation.Configuration; * Generated by camel-package-maven-plugin - do not edit this file! */ @Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") @EnableConfigurationProperties(CometdComponentConfiguration.class) public class CometdComponentAutoConfiguration { http://git-wip-us.apache.org/repos/asf/camel/blob/d8edc022/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/direct/springboot/DirectComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/direct/springboot/DirectComponentAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/direct/springboot/DirectComponentAutoConfiguration.java index 75533f5..934f482 100644 --- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/direct/springboot/DirectComponentAutoConfiguration.java +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/direct/springboot/DirectComponentAutoConfiguration.java @@ -21,6 +21,7 @@ import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.component.direct.DirectComponent; import org.apache.camel.util.IntrospectionSupport; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -31,6 +32,7 @@ import org.springframework.context.annotation.Configuration; * Generated by camel-package-maven-plugin - do not edit this file! */ @Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") @EnableConfigurationProperties(DirectComponentConfiguration.class) public class DirectComponentAutoConfiguration { http://git-wip-us.apache.org/repos/asf/camel/blob/d8edc022/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/directvm/springboot/DirectVmComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/directvm/springboot/DirectVmComponentAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/directvm/springboot/DirectVmComponentAutoConfiguration.java index 8b5c5a8..6715044 100644 --- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/directvm/springboot/DirectVmComponentAutoConfiguration.java +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/directvm/springboot/DirectVmComponentAutoConfiguration.java @@ -21,6 +21,7 @@ import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.component.directvm.DirectVmComponent; import org.apache.camel.util.IntrospectionSupport; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -31,6 +32,7 @@ import org.springframework.context.annotation.Configuration; * Generated by camel-package-maven-plugin - do not edit this file! */ @Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") @EnableConfigurationProperties(DirectVmComponentConfiguration.class) public class DirectVmComponentAutoConfiguration { http://git-wip-us.apache.org/repos/asf/camel/blob/d8edc022/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/log/springboot/LogComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/log/springboot/LogComponentAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/log/springboot/LogComponentAutoConfiguration.java index 79b0fb0..d4642b6 100644 --- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/log/springboot/LogComponentAutoConfiguration.java +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/log/springboot/LogComponentAutoConfiguration.java @@ -21,6 +21,7 @@ import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.component.log.LogComponent; import org.apache.camel.util.IntrospectionSupport; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -31,6 +32,7 @@ import org.springframework.context.annotation.Configuration; * Generated by camel-package-maven-plugin - do not edit this file! */ @Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") @EnableConfigurationProperties(LogComponentConfiguration.class) public class LogComponentAutoConfiguration { http://git-wip-us.apache.org/repos/asf/camel/blob/d8edc022/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/properties/springboot/PropertiesComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/properties/springboot/PropertiesComponentAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/properties/springboot/PropertiesComponentAutoConfiguration.java index 9ea63c5..a687337 100644 --- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/properties/springboot/PropertiesComponentAutoConfiguration.java +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/properties/springboot/PropertiesComponentAutoConfiguration.java @@ -21,6 +21,7 @@ import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.component.properties.PropertiesComponent; import org.apache.camel.util.IntrospectionSupport; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -31,6 +32,7 @@ import org.springframework.context.annotation.Configuration; * Generated by camel-package-maven-plugin - do not edit this file! */ @Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") @EnableConfigurationProperties(PropertiesComponentConfiguration.class) public class PropertiesComponentAutoConfiguration { http://git-wip-us.apache.org/repos/asf/camel/blob/d8edc022/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/rest/springboot/RestComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/rest/springboot/RestComponentAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/rest/springboot/RestComponentAutoConfiguration.java index 5010365..e0cd883 100644 --- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/rest/springboot/RestComponentAutoConfiguration.java +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/rest/springboot/RestComponentAutoConfiguration.java @@ -21,6 +21,7 @@ import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.component.rest.RestComponent; import org.apache.camel.util.IntrospectionSupport; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -31,6 +32,7 @@ import org.springframework.context.annotation.Configuration; * Generated by camel-package-maven-plugin - do not edit this file! */ @Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") @EnableConfigurationProperties(RestComponentConfiguration.class) public class RestComponentAutoConfiguration { http://git-wip-us.apache.org/repos/asf/camel/blob/d8edc022/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/scheduler/springboot/SchedulerComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/scheduler/springboot/SchedulerComponentAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/scheduler/springboot/SchedulerComponentAutoConfiguration.java index 09a56a7..e0bc18f 100644 --- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/scheduler/springboot/SchedulerComponentAutoConfiguration.java +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/scheduler/springboot/SchedulerComponentAutoConfiguration.java @@ -21,6 +21,7 @@ import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.component.scheduler.SchedulerComponent; import org.apache.camel.util.IntrospectionSupport; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -31,6 +32,7 @@ import org.springframework.context.annotation.Configuration; * Generated by camel-package-maven-plugin - do not edit this file! */ @Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") @EnableConfigurationProperties(SchedulerComponentConfiguration.class) public class SchedulerComponentAutoConfiguration { http://git-wip-us.apache.org/repos/asf/camel/blob/d8edc022/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/seda/springboot/SedaComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/seda/springboot/SedaComponentAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/seda/springboot/SedaComponentAutoConfiguration.java index 09e9357..a9240c4 100644 --- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/seda/springboot/SedaComponentAutoConfiguration.java +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/seda/springboot/SedaComponentAutoConfiguration.java @@ -21,6 +21,7 @@ import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.component.seda.SedaComponent; import org.apache.camel.util.IntrospectionSupport; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -31,6 +32,7 @@ import org.springframework.context.annotation.Configuration; * Generated by camel-package-maven-plugin - do not edit this file! */ @Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") @EnableConfigurationProperties(SedaComponentConfiguration.class) public class SedaComponentAutoConfiguration { http://git-wip-us.apache.org/repos/asf/camel/blob/d8edc022/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/stub/springboot/StubComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/stub/springboot/StubComponentAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/stub/springboot/StubComponentAutoConfiguration.java index 8b1de4f..33f2655 100644 --- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/stub/springboot/StubComponentAutoConfiguration.java +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/stub/springboot/StubComponentAutoConfiguration.java @@ -21,6 +21,7 @@ import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.component.stub.StubComponent; import org.apache.camel.util.IntrospectionSupport; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -31,6 +32,7 @@ import org.springframework.context.annotation.Configuration; * Generated by camel-package-maven-plugin - do not edit this file! */ @Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") @EnableConfigurationProperties(StubComponentConfiguration.class) public class StubComponentAutoConfiguration { http://git-wip-us.apache.org/repos/asf/camel/blob/d8edc022/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/validator/springboot/ValidatorComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/validator/springboot/ValidatorComponentAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/validator/springboot/ValidatorComponentAutoConfiguration.java index a081945..311c352 100644 --- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/validator/springboot/ValidatorComponentAutoConfiguration.java +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/validator/springboot/ValidatorComponentAutoConfiguration.java @@ -21,6 +21,7 @@ import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.component.validator.ValidatorComponent; import org.apache.camel.util.IntrospectionSupport; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -31,6 +32,7 @@ import org.springframework.context.annotation.Configuration; * Generated by camel-package-maven-plugin - do not edit this file! */ @Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") @EnableConfigurationProperties(ValidatorComponentConfiguration.class) public class ValidatorComponentAutoConfiguration { http://git-wip-us.apache.org/repos/asf/camel/blob/d8edc022/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/vm/springboot/VmComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/vm/springboot/VmComponentAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/vm/springboot/VmComponentAutoConfiguration.java index 634bc3f..dea939c 100644 --- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/vm/springboot/VmComponentAutoConfiguration.java +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/vm/springboot/VmComponentAutoConfiguration.java @@ -21,6 +21,7 @@ import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.component.vm.VmComponent; import org.apache.camel.util.IntrospectionSupport; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -31,6 +32,7 @@ import org.springframework.context.annotation.Configuration; * Generated by camel-package-maven-plugin - do not edit this file! */ @Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") @EnableConfigurationProperties(VmComponentConfiguration.class) public class VmComponentAutoConfiguration { http://git-wip-us.apache.org/repos/asf/camel/blob/d8edc022/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/xslt/springboot/XsltComponentAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/xslt/springboot/XsltComponentAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/xslt/springboot/XsltComponentAutoConfiguration.java index ae5ea0e..a7433c9 100644 --- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/xslt/springboot/XsltComponentAutoConfiguration.java +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/xslt/springboot/XsltComponentAutoConfiguration.java @@ -21,6 +21,7 @@ import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.component.xslt.XsltComponent; import org.apache.camel.util.IntrospectionSupport; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -31,6 +32,7 @@ import org.springframework.context.annotation.Configuration; * Generated by camel-package-maven-plugin - do not edit this file! */ @Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") @EnableConfigurationProperties(XsltComponentConfiguration.class) public class XsltComponentAutoConfiguration { http://git-wip-us.apache.org/repos/asf/camel/blob/d8edc022/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/GzipDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/GzipDataFormatAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/GzipDataFormatAutoConfiguration.java index aaff31d..b4b04a1 100644 --- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/GzipDataFormatAutoConfiguration.java +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/GzipDataFormatAutoConfiguration.java @@ -22,6 +22,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; import org.apache.camel.impl.GzipDataFormat; import org.apache.camel.util.IntrospectionSupport; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -32,6 +33,7 @@ import org.springframework.context.annotation.Configuration; * Generated by camel-package-maven-plugin - do not edit this file! */ @Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") @EnableConfigurationProperties(GzipDataFormatConfiguration.class) public class GzipDataFormatAutoConfiguration { http://git-wip-us.apache.org/repos/asf/camel/blob/d8edc022/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/SerializationDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/SerializationDataFormatAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/SerializationDataFormatAutoConfiguration.java index fbcc1a7..f5d5e24 100644 --- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/SerializationDataFormatAutoConfiguration.java +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/SerializationDataFormatAutoConfiguration.java @@ -22,6 +22,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; import org.apache.camel.impl.SerializationDataFormat; import org.apache.camel.util.IntrospectionSupport; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -32,6 +33,7 @@ import org.springframework.context.annotation.Configuration; * Generated by camel-package-maven-plugin - do not edit this file! */ @Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") @EnableConfigurationProperties(SerializationDataFormatConfiguration.class) public class SerializationDataFormatAutoConfiguration { http://git-wip-us.apache.org/repos/asf/camel/blob/d8edc022/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/StringDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/StringDataFormatAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/StringDataFormatAutoConfiguration.java index 35daf7b..b83f68e 100644 --- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/StringDataFormatAutoConfiguration.java +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/StringDataFormatAutoConfiguration.java @@ -22,6 +22,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; import org.apache.camel.impl.StringDataFormat; import org.apache.camel.util.IntrospectionSupport; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -32,6 +33,7 @@ import org.springframework.context.annotation.Configuration; * Generated by camel-package-maven-plugin - do not edit this file! */ @Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") @EnableConfigurationProperties(StringDataFormatConfiguration.class) public class StringDataFormatAutoConfiguration { http://git-wip-us.apache.org/repos/asf/camel/blob/d8edc022/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/ZipDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/ZipDataFormatAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/ZipDataFormatAutoConfiguration.java index bc1170d..682ef0c 100644 --- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/ZipDataFormatAutoConfiguration.java +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/ZipDataFormatAutoConfiguration.java @@ -22,6 +22,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; import org.apache.camel.impl.ZipDataFormat; import org.apache.camel.util.IntrospectionSupport; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -32,6 +33,7 @@ import org.springframework.context.annotation.Configuration; * Generated by camel-package-maven-plugin - do not edit this file! */ @Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") @EnableConfigurationProperties(ZipDataFormatConfiguration.class) public class ZipDataFormatAutoConfiguration { http://git-wip-us.apache.org/repos/asf/camel/blob/d8edc022/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/bean/springboot/BeanLanguageAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/bean/springboot/BeanLanguageAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/bean/springboot/BeanLanguageAutoConfiguration.java index d059788..20d7d90 100644 --- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/bean/springboot/BeanLanguageAutoConfiguration.java +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/bean/springboot/BeanLanguageAutoConfiguration.java @@ -22,6 +22,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; import org.apache.camel.language.bean.BeanLanguage; import org.apache.camel.util.IntrospectionSupport; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -32,6 +33,7 @@ import org.springframework.context.annotation.Configuration; * Generated by camel-package-maven-plugin - do not edit this file! */ @Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") @EnableConfigurationProperties(BeanLanguageConfiguration.class) public class BeanLanguageAutoConfiguration { http://git-wip-us.apache.org/repos/asf/camel/blob/d8edc022/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/constant/springboot/ConstantLanguageAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/constant/springboot/ConstantLanguageAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/constant/springboot/ConstantLanguageAutoConfiguration.java index 996c5d2..68bed73 100644 --- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/constant/springboot/ConstantLanguageAutoConfiguration.java +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/constant/springboot/ConstantLanguageAutoConfiguration.java @@ -22,6 +22,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; import org.apache.camel.language.constant.ConstantLanguage; import org.apache.camel.util.IntrospectionSupport; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -32,6 +33,7 @@ import org.springframework.context.annotation.Configuration; * Generated by camel-package-maven-plugin - do not edit this file! */ @Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") @EnableConfigurationProperties(ConstantLanguageConfiguration.class) public class ConstantLanguageAutoConfiguration { http://git-wip-us.apache.org/repos/asf/camel/blob/d8edc022/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/header/springboot/HeaderLanguageAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/header/springboot/HeaderLanguageAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/header/springboot/HeaderLanguageAutoConfiguration.java index 93276ef..0afe56d 100644 --- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/header/springboot/HeaderLanguageAutoConfiguration.java +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/header/springboot/HeaderLanguageAutoConfiguration.java @@ -22,6 +22,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; import org.apache.camel.language.header.HeaderLanguage; import org.apache.camel.util.IntrospectionSupport; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -32,6 +33,7 @@ import org.springframework.context.annotation.Configuration; * Generated by camel-package-maven-plugin - do not edit this file! */ @Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") @EnableConfigurationProperties(HeaderLanguageConfiguration.class) public class HeaderLanguageAutoConfiguration { http://git-wip-us.apache.org/repos/asf/camel/blob/d8edc022/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/property/springboot/ExchangePropertyLanguageAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/property/springboot/ExchangePropertyLanguageAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/property/springboot/ExchangePropertyLanguageAutoConfiguration.java index 824866b..77063cf 100644 --- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/property/springboot/ExchangePropertyLanguageAutoConfiguration.java +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/property/springboot/ExchangePropertyLanguageAutoConfiguration.java @@ -22,6 +22,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; import org.apache.camel.language.property.ExchangePropertyLanguage; import org.apache.camel.util.IntrospectionSupport; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -32,6 +33,7 @@ import org.springframework.context.annotation.Configuration; * Generated by camel-package-maven-plugin - do not edit this file! */ @Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") @EnableConfigurationProperties(ExchangePropertyLanguageConfiguration.class) public class ExchangePropertyLanguageAutoConfiguration { http://git-wip-us.apache.org/repos/asf/camel/blob/d8edc022/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/ref/springboot/RefLanguageAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/ref/springboot/RefLanguageAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/ref/springboot/RefLanguageAutoConfiguration.java index 49f3588..db53888 100644 --- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/ref/springboot/RefLanguageAutoConfiguration.java +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/ref/springboot/RefLanguageAutoConfiguration.java @@ -22,6 +22,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; import org.apache.camel.language.ref.RefLanguage; import org.apache.camel.util.IntrospectionSupport; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -32,6 +33,7 @@ import org.springframework.context.annotation.Configuration; * Generated by camel-package-maven-plugin - do not edit this file! */ @Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") @EnableConfigurationProperties(RefLanguageConfiguration.class) public class RefLanguageAutoConfiguration { http://git-wip-us.apache.org/repos/asf/camel/blob/d8edc022/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/simple/springboot/FileLanguageAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/simple/springboot/FileLanguageAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/simple/springboot/FileLanguageAutoConfiguration.java index 422ea84..5185fb3 100644 --- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/simple/springboot/FileLanguageAutoConfiguration.java +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/simple/springboot/FileLanguageAutoConfiguration.java @@ -22,6 +22,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; import org.apache.camel.language.simple.FileLanguage; import org.apache.camel.util.IntrospectionSupport; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -32,6 +33,7 @@ import org.springframework.context.annotation.Configuration; * Generated by camel-package-maven-plugin - do not edit this file! */ @Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") @EnableConfigurationProperties(FileLanguageConfiguration.class) public class FileLanguageAutoConfiguration { http://git-wip-us.apache.org/repos/asf/camel/blob/d8edc022/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/simple/springboot/SimpleLanguageAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/simple/springboot/SimpleLanguageAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/simple/springboot/SimpleLanguageAutoConfiguration.java index 52811ec..8be5aaa 100644 --- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/simple/springboot/SimpleLanguageAutoConfiguration.java +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/simple/springboot/SimpleLanguageAutoConfiguration.java @@ -22,6 +22,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; import org.apache.camel.language.simple.SimpleLanguage; import org.apache.camel.util.IntrospectionSupport; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -32,6 +33,7 @@ import org.springframework.context.annotation.Configuration; * Generated by camel-package-maven-plugin - do not edit this file! */ @Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") @EnableConfigurationProperties(SimpleLanguageConfiguration.class) public class SimpleLanguageAutoConfiguration { http://git-wip-us.apache.org/repos/asf/camel/blob/d8edc022/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/tokenizer/springboot/TokenizeLanguageAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/tokenizer/springboot/TokenizeLanguageAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/tokenizer/springboot/TokenizeLanguageAutoConfiguration.java index 6a902ac..0ee15cf 100644 --- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/tokenizer/springboot/TokenizeLanguageAutoConfiguration.java +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/tokenizer/springboot/TokenizeLanguageAutoConfiguration.java @@ -22,6 +22,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; import org.apache.camel.language.tokenizer.TokenizeLanguage; import org.apache.camel.util.IntrospectionSupport; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -32,6 +33,7 @@ import org.springframework.context.annotation.Configuration; * Generated by camel-package-maven-plugin - do not edit this file! */ @Configuration +@ConditionalOnBean(type = "org.apache.camel.springboot.CamelAutoConfiguration") @EnableConfigurationProperties(TokenizeLanguageConfiguration.class) public class TokenizeLanguageAutoConfiguration {
