Regen spring-boot components-starter

Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cd54a966
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cd54a966
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cd54a966

Branch: refs/heads/master
Commit: cd54a9665de1f0dddfa343a4d2fbe260769880bf
Parents: 545f3f7
Author: lburgazzoli <[email protected]>
Authored: Sat May 20 18:37:03 2017 +0200
Committer: lburgazzoli <[email protected]>
Committed: Sat May 20 18:37:43 2017 +0200

----------------------------------------------------------------------
 .../AhcComponentAutoConfiguration.java          | 25 +++------
 .../WsComponentAutoConfiguration.java           | 25 +++------
 .../AMQPComponentAutoConfiguration.java         | 25 +++------
 .../ApnsComponentAutoConfiguration.java         | 25 +++------
 .../AsteriskComponentAutoConfiguration.java     | 25 +++------
 .../AtmosComponentAutoConfiguration.java        | 25 +++------
 .../WebsocketComponentAutoConfiguration.java    | 25 +++------
 .../AtomComponentAutoConfiguration.java         | 25 +++------
 .../AvroComponentAutoConfiguration.java         | 25 +++------
 .../AvroDataFormatAutoConfiguration.java        | 27 +++-------
 .../CwComponentAutoConfiguration.java           | 25 +++------
 .../DdbComponentAutoConfiguration.java          | 25 +++------
 .../DdbStreamComponentAutoConfiguration.java    | 25 +++------
 .../EC2ComponentAutoConfiguration.java          | 25 +++------
 ...nesisFirehoseComponentAutoConfiguration.java | 27 +++-------
 .../KinesisComponentAutoConfiguration.java      | 25 +++------
 .../S3ComponentAutoConfiguration.java           | 25 +++------
 .../SdbComponentAutoConfiguration.java          | 25 +++------
 .../SesComponentAutoConfiguration.java          | 25 +++------
 .../SnsComponentAutoConfiguration.java          | 25 +++------
 .../SqsComponentAutoConfiguration.java          | 25 +++------
 .../SWFComponentAutoConfiguration.java          | 25 +++------
 .../BlobServiceComponentAutoConfiguration.java  | 25 +++------
 .../QueueServiceComponentAutoConfiguration.java | 25 +++------
 .../BarcodeDataFormatAutoConfiguration.java     | 27 +++-------
 .../Base64DataFormatAutoConfiguration.java      | 27 +++-------
 ...BeanValidatorComponentAutoConfiguration.java | 27 +++-------
 .../BeanIODataFormatAutoConfiguration.java      | 27 +++-------
 .../BeanstalkComponentAutoConfiguration.java    | 25 +++------
 .../BindyCsvDataFormatAutoConfiguration.java    | 27 +++-------
 ...yFixedLengthDataFormatAutoConfiguration.java | 29 +++--------
 ...KeyValuePairDataFormatAutoConfiguration.java | 29 +++--------
 .../BonitaComponentAutoConfiguration.java       | 25 +++------
 .../BoonDataFormatAutoConfiguration.java        | 27 +++-------
 .../BoxComponentAutoConfiguration.java          | 25 +++------
 .../BraintreeComponentAutoConfiguration.java    | 25 +++------
 .../CacheComponentAutoConfiguration.java        | 25 +++------
 .../CassandraComponentAutoConfiguration.java    | 25 +++------
 .../CastorDataFormatAutoConfiguration.java      | 27 +++-------
 ...ronicleEngineComponentAutoConfiguration.java | 27 +++-------
 .../ChunkComponentAutoConfiguration.java        | 25 +++------
 .../CMComponentAutoConfiguration.java           | 25 +++------
 .../CMISComponentAutoConfiguration.java         | 25 +++------
 .../CoAPComponentAutoConfiguration.java         | 25 +++------
 .../CometdComponentAutoConfiguration.java       | 25 +++------
 .../ConsulComponentAutoConfiguration.java       | 25 +++------
 ...lifiedContextComponentAutoConfiguration.java | 27 +++-------
 .../BeanComponentAutoConfiguration.java         | 25 +++------
 .../ClassComponentAutoConfiguration.java        | 25 +++------
 .../BindingNameComponentAutoConfiguration.java  | 25 +++------
 .../BrowseComponentAutoConfiguration.java       | 25 +++------
 .../ControlBusComponentAutoConfiguration.java   | 25 +++------
 .../DataFormatComponentAutoConfiguration.java   | 25 +++------
 .../DataSetComponentAutoConfiguration.java      | 25 +++------
 .../DirectComponentAutoConfiguration.java       | 25 +++------
 .../DirectVmComponentAutoConfiguration.java     | 25 +++------
 .../FileComponentAutoConfiguration.java         | 25 +++------
 .../LanguageComponentAutoConfiguration.java     | 25 +++------
 .../LogComponentAutoConfiguration.java          | 25 +++------
 .../MockComponentAutoConfiguration.java         | 25 +++------
 .../PropertiesComponentAutoConfiguration.java   | 25 +++------
 .../RefComponentAutoConfiguration.java          | 25 +++------
 .../RestApiComponentAutoConfiguration.java      | 25 +++------
 .../RestComponentAutoConfiguration.java         | 25 +++------
 .../SchedulerComponentAutoConfiguration.java    | 25 +++------
 .../SedaComponentAutoConfiguration.java         | 25 +++------
 .../StubComponentAutoConfiguration.java         | 25 +++------
 .../TestComponentAutoConfiguration.java         | 25 +++------
 .../TimerComponentAutoConfiguration.java        | 25 +++------
 .../ValidatorComponentAutoConfiguration.java    | 25 +++------
 .../VmComponentAutoConfiguration.java           | 25 +++------
 .../XsltComponentAutoConfiguration.java         | 25 +++------
 .../GzipDataFormatAutoConfiguration.java        | 27 +++-------
 ...erializationDataFormatAutoConfiguration.java | 29 +++--------
 .../StringDataFormatAutoConfiguration.java      | 27 +++-------
 .../ZipDataFormatAutoConfiguration.java         | 27 +++-------
 .../BeanLanguageAutoConfiguration.java          | 29 +++--------
 .../ConstantLanguageAutoConfiguration.java      | 29 +++--------
 .../HeaderLanguageAutoConfiguration.java        | 29 +++--------
 ...changePropertyLanguageAutoConfiguration.java | 31 +++---------
 .../RefLanguageAutoConfiguration.java           | 29 +++--------
 .../FileLanguageAutoConfiguration.java          | 29 +++--------
 .../SimpleLanguageAutoConfiguration.java        | 29 +++--------
 .../TokenizeLanguageAutoConfiguration.java      | 29 +++--------
 .../XMLTokenizeLanguageAutoConfiguration.java   | 29 +++--------
 .../XPathLanguageAutoConfiguration.java         | 29 +++--------
 .../CouchbaseComponentAutoConfiguration.java    | 25 +++------
 .../CouchDbComponentAutoConfiguration.java      | 25 +++------
 ...italSignatureComponentAutoConfiguration.java | 27 +++-------
 .../CryptoDataFormatAutoConfiguration.java      | 27 +++-------
 .../PGPDataFormatAutoConfiguration.java         | 27 +++-------
 .../CsvDataFormatAutoConfiguration.java         | 27 +++-------
 .../CxfRsComponentAutoConfiguration.java        | 25 +++------
 .../CxfComponentAutoConfiguration.java          | 25 +++------
 .../DigitalOceanComponentAutoConfiguration.java | 25 +++------
 .../DisruptorComponentAutoConfiguration.java    | 25 +++------
 .../DisruptorVmComponentAutoConfiguration.java  | 25 +++------
 .../DnsComponentAutoConfiguration.java          | 25 +++------
 .../DockerComponentAutoConfiguration.java       | 25 +++------
 .../DozerComponentAutoConfiguration.java        | 25 +++------
 .../DrillComponentAutoConfiguration.java        | 25 +++------
 .../DropboxComponentAutoConfiguration.java      | 25 +++------
 .../EhcacheComponentAutoConfiguration.java      | 27 +++-------
 .../customizer/CacheManagerCustomizer.java      | 33 ++++++------
 ...anagerCustomizerWithoutCacheManagerTest.java | 53 ++++++++++++++++++++
 ...ElasticsearchComponentAutoConfiguration.java | 27 +++-------
 ...ElasticsearchComponentAutoConfiguration.java | 27 +++-------
 .../ElsqlComponentAutoConfiguration.java        | 25 +++------
 .../EtcdComponentAutoConfiguration.java         | 25 +++------
 .../ExecComponentAutoConfiguration.java         | 25 +++------
 .../FacebookComponentAutoConfiguration.java     | 25 +++------
 .../FlatpackComponentAutoConfiguration.java     | 25 +++------
 .../FlatpackDataFormatAutoConfiguration.java    | 27 +++-------
 .../FlinkComponentAutoConfiguration.java        | 25 +++------
 .../FopComponentAutoConfiguration.java          | 25 +++------
 .../FreemarkerComponentAutoConfiguration.java   | 25 +++------
 .../FtpComponentAutoConfiguration.java          | 25 +++------
 .../FtpsComponentAutoConfiguration.java         | 25 +++------
 .../SftpComponentAutoConfiguration.java         | 25 +++------
 .../GangliaComponentAutoConfiguration.java      | 25 +++------
 .../GeoCoderComponentAutoConfiguration.java     | 25 +++------
 .../GitComponentAutoConfiguration.java          | 25 +++------
 .../GitHubComponentAutoConfiguration.java       | 25 +++------
 ...oogleCalendarComponentAutoConfiguration.java | 27 +++-------
 .../GoogleDriveComponentAutoConfiguration.java  | 25 +++------
 .../GoogleMailComponentAutoConfiguration.java   | 25 +++------
 .../GooglePubsubComponentAutoConfiguration.java | 25 +++------
 .../GoraComponentAutoConfiguration.java         | 25 +++------
 .../GroovyLanguageAutoConfiguration.java        | 31 ++++--------
 .../GrpcComponentAutoConfiguration.java         | 25 +++------
 .../GsonDataFormatAutoConfiguration.java        | 27 +++-------
 ...GuavaEventBusComponentAutoConfiguration.java | 27 +++-------
 ...tAtomicnumberComponentAutoConfiguration.java | 27 +++-------
 ...lcastInstanceComponentAutoConfiguration.java | 27 +++-------
 ...HazelcastListComponentAutoConfiguration.java | 27 +++-------
 .../HazelcastMapComponentAutoConfiguration.java | 25 +++------
 ...lcastMultimapComponentAutoConfiguration.java | 27 +++-------
 ...azelcastQueueComponentAutoConfiguration.java | 27 +++-------
 ...ReplicatedmapComponentAutoConfiguration.java | 27 +++-------
 ...astRingbufferComponentAutoConfiguration.java | 27 +++-------
 ...HazelcastSedaComponentAutoConfiguration.java | 27 +++-------
 .../HazelcastSetComponentAutoConfiguration.java | 25 +++------
 ...azelcastTopicComponentAutoConfiguration.java | 27 +++-------
 .../HBaseComponentAutoConfiguration.java        | 25 +++------
 .../HdfsComponentAutoConfiguration.java         | 25 +++------
 .../HdfsComponentAutoConfiguration.java         | 25 +++------
 .../HessianDataFormatAutoConfiguration.java     | 27 +++-------
 .../HipchatComponentAutoConfiguration.java      | 25 +++------
 .../HL7DataFormatAutoConfiguration.java         | 27 +++-------
 .../TerserLanguageAutoConfiguration.java        | 29 +++--------
 .../HttpComponentAutoConfiguration.java         | 25 +++------
 .../HttpComponentAutoConfiguration.java         | 25 +++------
 .../ICalDataFormatAutoConfiguration.java        | 27 +++-------
 .../IgniteCacheComponentAutoConfiguration.java  | 25 +++------
 ...IgniteComputeComponentAutoConfiguration.java | 27 +++-------
 .../IgniteEventsComponentAutoConfiguration.java | 25 +++------
 .../IgniteIdGenComponentAutoConfiguration.java  | 25 +++------
 ...niteMessagingComponentAutoConfiguration.java | 27 +++-------
 .../IgniteQueueComponentAutoConfiguration.java  | 25 +++------
 .../IgniteSetComponentAutoConfiguration.java    | 25 +++------
 .../InfinispanComponentAutoConfiguration.java   | 25 +++------
 .../InfluxDbComponentAutoConfiguration.java     | 25 +++------
 .../IrcComponentAutoConfiguration.java          | 25 +++------
 .../IronMQComponentAutoConfiguration.java       | 25 +++------
 .../JacksonDataFormatAutoConfiguration.java     | 27 +++-------
 .../JacksonXMLDataFormatAutoConfiguration.java  | 27 +++-------
 .../JavaSpaceComponentAutoConfiguration.java    | 25 +++------
 .../JaxbDataFormatAutoConfiguration.java        | 27 +++-------
 .../JBPMComponentAutoConfiguration.java         | 25 +++------
 .../JCacheComponentAutoConfiguration.java       | 25 +++------
 .../JcrComponentAutoConfiguration.java          | 25 +++------
 .../JdbcComponentAutoConfiguration.java         | 25 +++------
 .../JettyHttpComponentAutoConfiguration9.java   | 25 +++------
 .../JGroupsComponentAutoConfiguration.java      | 25 +++------
 .../JibxDataFormatAutoConfiguration.java        | 27 +++-------
 .../JingComponentAutoConfiguration.java         | 25 +++------
 .../JIRAComponentAutoConfiguration.java         | 25 +++------
 .../JmsComponentAutoConfiguration.java          | 25 +++------
 .../JMXComponentAutoConfiguration.java          | 25 +++------
 .../JohnzonDataFormatAutoConfiguration.java     | 27 +++-------
 .../JoltComponentAutoConfiguration.java         | 25 +++------
 .../SqlLanguageAutoConfiguration.java           | 29 +++--------
 .../JpaComponentAutoConfiguration.java          | 25 +++------
 .../ScpComponentAutoConfiguration.java          | 25 +++------
 .../JsonPathLanguageAutoConfiguration.java      | 29 +++--------
 .../Jt400ComponentAutoConfiguration.java        | 25 +++------
 .../JuelLanguageAutoConfiguration.java          | 29 +++--------
 .../JXPathLanguageAutoConfiguration.java        | 29 +++--------
 .../KafkaComponentAutoConfiguration.java        | 25 +++------
 .../KestrelComponentAutoConfiguration.java      | 25 +++------
 .../KratiComponentAutoConfiguration.java        | 25 +++------
 .../KubernetesComponentAutoConfiguration.java   | 25 +++------
 .../LdapComponentAutoConfiguration.java         | 25 +++------
 .../LinkedInComponentAutoConfiguration.java     | 25 +++------
 .../LuceneComponentAutoConfiguration.java       | 25 +++------
 .../LumberjackComponentAutoConfiguration.java   | 25 +++------
 .../LZFDataFormatAutoConfiguration.java         | 27 +++-------
 .../MailComponentAutoConfiguration.java         | 25 +++------
 ...imeMultipartDataFormatAutoConfiguration.java | 29 +++--------
 .../MetricsComponentAutoConfiguration.java      | 25 +++------
 .../MiloClientComponentAutoConfiguration.java   | 25 +++------
 .../MiloServerComponentAutoConfiguration.java   | 25 +++------
 .../Mina2ComponentAutoConfiguration.java        | 25 +++------
 .../MllpComponentAutoConfiguration.java         | 25 +++------
 .../GridFsComponentAutoConfiguration.java       | 25 +++------
 .../MongoDbComponentAutoConfiguration.java      | 25 +++------
 .../MongoDbComponentAutoConfiguration.java      | 25 +++------
 .../MQTTComponentAutoConfiguration.java         | 25 +++------
 .../MsvComponentAutoConfiguration.java          | 25 +++------
 .../MustacheComponentAutoConfiguration.java     | 25 +++------
 .../MvelComponentAutoConfiguration.java         | 25 +++------
 .../MvelLanguageAutoConfiguration.java          | 29 +++--------
 .../MyBatisComponentAutoConfiguration.java      | 25 +++------
 .../NagiosComponentAutoConfiguration.java       | 25 +++------
 .../NatsComponentAutoConfiguration.java         | 25 +++------
 .../NettyHttpComponentAutoConfiguration.java    | 25 +++------
 .../NettyHttpAutoConfigurationTest.java         |  8 ++-
 .../src/test/resources/application.properties   |  1 +
 .../NettyComponentAutoConfiguration.java        | 25 +++------
 .../NettyHttpComponentAutoConfiguration.java    | 27 +++-------
 .../Netty4HttpAutoConfigurationTest.java        | 15 ++++--
 .../http/springboot/Netty4HttpSSLTest.java      | 22 ++++----
 .../NettyComponentAutoConfiguration.java        | 25 +++------
 .../OgnlLanguageAutoConfiguration.java          | 29 +++--------
 .../Olingo2ComponentAutoConfiguration.java      | 25 +++------
 .../Olingo4ComponentAutoConfiguration.java      | 25 +++------
 .../OpenShiftComponentAutoConfiguration.java    | 25 +++------
 .../CinderComponentAutoConfiguration.java       | 25 +++------
 .../GlanceComponentAutoConfiguration.java       | 25 +++------
 .../KeystoneComponentAutoConfiguration.java     | 25 +++------
 .../NeutronComponentAutoConfiguration.java      | 25 +++------
 .../NovaComponentAutoConfiguration.java         | 25 +++------
 .../SwiftComponentAutoConfiguration.java        | 25 +++------
 .../OptaPlannerComponentAutoConfiguration.java  | 25 +++------
 .../PahoComponentAutoConfiguration.java         | 25 +++------
 .../PdfComponentAutoConfiguration.java          | 25 +++------
 .../PgEventComponentAutoConfiguration.java      | 25 +++------
 .../PrinterComponentAutoConfiguration.java      | 25 +++------
 .../ProtobufDataFormatAutoConfiguration.java    | 27 +++-------
 .../PubNubComponentAutoConfiguration.java       | 25 +++------
 .../QuartzComponentAutoConfiguration.java       | 25 +++------
 .../QuickfixjComponentAutoConfiguration.java    | 25 +++------
 .../RabbitMQComponentAutoConfiguration.java     | 25 +++------
 ...activeStreamsComponentAutoConfiguration.java | 27 +++-------
 .../ReactiveStreamsAutoConfigurationTest.java   | 14 +++---
 .../test/ReactiveStreamsDefaultEngineTest.java  | 18 +++----
 .../test/ReactiveStreamsNamedEngineTest.java    |  9 ++--
 .../test/ReactiveStreamsRegistryEngineTest.java |  9 ++--
 .../src/test/resources/application.properties   |  1 +
 .../RestSwaggerComponentAutoConfiguration.java  | 25 +++------
 .../RestletComponentAutoConfiguration.java      | 25 +++------
 .../RmiComponentAutoConfiguration.java          | 25 +++------
 .../RouteboxComponentAutoConfiguration.java     | 25 +++------
 .../RssComponentAutoConfiguration.java          | 25 +++------
 .../RssDataFormatAutoConfiguration.java         | 27 +++-------
 .../SalesforceComponentAutoConfiguration.java   | 25 +++------
 .../NetWeaverComponentAutoConfiguration.java    | 25 +++------
 .../XQueryComponentAutoConfiguration.java       | 25 +++------
 .../XQueryLanguageAutoConfiguration.java        | 29 +++--------
 .../SchematronComponentAutoConfiguration.java   | 25 +++------
 .../JavaScriptLanguageAutoConfiguration.java    | 29 +++--------
 .../PhpLanguageAutoConfiguration.java           | 29 +++--------
 .../PythonLanguageAutoConfiguration.java        | 29 +++--------
 .../RubyLanguageAutoConfiguration.java          | 29 +++--------
 .../ServiceNowComponentAutoConfiguration.java   | 25 +++------
 .../ServletComponentAutoConfiguration.java      | 25 +++------
 .../SipComponentAutoConfiguration.java          | 25 +++------
 .../SjmsBatchComponentAutoConfiguration.java    | 25 +++------
 .../SjmsComponentAutoConfiguration.java         | 25 +++------
 .../Sjms2ComponentAutoConfiguration.java        | 25 +++------
 .../SlackComponentAutoConfiguration.java        | 25 +++------
 .../SmppComponentAutoConfiguration.java         | 25 +++------
 .../SnakeYAMLDataFormatAutoConfiguration.java   | 30 +++--------
 .../SnmpComponentAutoConfiguration.java         | 25 +++------
 .../SoapJaxbDataFormatAutoConfiguration.java    | 27 +++-------
 .../SolrComponentAutoConfiguration.java         | 25 +++------
 .../SparkComponentAutoConfiguration.java        | 25 +++------
 .../SplunkComponentAutoConfiguration.java       | 25 +++------
 .../SpringBatchComponentAutoConfiguration.java  | 25 +++------
 ...ngIntegrationComponentAutoConfiguration.java | 27 +++-------
 .../SpringLdapComponentAutoConfiguration.java   | 25 +++------
 .../RedisComponentAutoConfiguration.java        | 25 +++------
 .../EventComponentAutoConfiguration.java        | 25 +++------
 .../SpelLanguageAutoConfiguration.java          | 29 +++--------
 ...ingWebserviceComponentAutoConfiguration.java | 27 +++-------
 .../SqlComponentAutoConfiguration.java          | 25 +++------
 .../SqlStoredComponentAutoConfiguration.java    | 25 +++------
 .../SshComponentAutoConfiguration.java          | 25 +++------
 .../StAXComponentAutoConfiguration.java         | 25 +++------
 .../StompComponentAutoConfiguration.java        | 25 +++------
 .../StreamComponentAutoConfiguration.java       | 25 +++------
 ...tringTemplateComponentAutoConfiguration.java | 27 +++-------
 .../SyslogDataFormatAutoConfiguration.java      | 27 +++-------
 .../TidyMarkupDataFormatAutoConfiguration.java  | 27 +++-------
 .../TarFileDataFormatAutoConfiguration.java     | 27 +++-------
 .../TelegramComponentAutoConfiguration.java     | 25 +++------
 .../TikaComponentAutoConfiguration.java         | 25 +++------
 .../TwitterComponentAutoConfiguration.java      | 25 +++------
 .../UndertowComponentAutoConfiguration.java     | 25 +++------
 .../component/undertow/UndertowSSLTest.java     | 23 +++++----
 .../src/test/resources/application.properties   |  1 +
 ...UniVocityCsvDataFormatAutoConfiguration.java | 29 +++--------
 ...tyFixedWidthDataFormatAutoConfiguration.java | 29 +++--------
 ...UniVocityTsvDataFormatAutoConfiguration.java | 29 +++--------
 .../VelocityComponentAutoConfiguration.java     | 25 +++------
 .../VertxComponentAutoConfiguration.java        | 25 +++------
 .../WeatherComponentAutoConfiguration.java      | 25 +++------
 .../WebsocketComponentAutoConfiguration.java    | 25 +++------
 .../XmlBeansDataFormatAutoConfiguration.java    | 27 +++-------
 .../XmlJsonDataFormatAutoConfiguration.java     | 27 +++-------
 .../XmlRpcComponentAutoConfiguration.java       | 25 +++------
 .../XmlRpcDataFormatAutoConfiguration.java      | 27 +++-------
 .../XmlSignatureComponentAutoConfiguration.java | 25 +++------
 .../XMLSecurityDataFormatAutoConfiguration.java | 27 +++-------
 .../XmppComponentAutoConfiguration.java         | 25 +++------
 .../JsonDataFormatAutoConfiguration.java        | 27 +++-------
 .../XStreamDataFormatAutoConfiguration.java     | 27 +++-------
 .../YammerComponentAutoConfiguration.java       | 25 +++------
 .../ZendeskComponentAutoConfiguration.java      | 25 +++------
 .../ZipFileDataFormatAutoConfiguration.java     | 27 +++-------
 .../MasterComponentAutoConfiguration.java       | 25 +++------
 .../ZooKeeperComponentAutoConfiguration.java    | 25 +++------
 322 files changed, 2089 insertions(+), 6102 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-ahc-starter/src/main/java/org/apache/camel/component/ahc/springboot/AhcComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git 
a/platforms/spring-boot/components-starter/camel-ahc-starter/src/main/java/org/apache/camel/component/ahc/springboot/AhcComponentAutoConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-ahc-starter/src/main/java/org/apache/camel/component/ahc/springboot/AhcComponentAutoConfiguration.java
index 619dbee..2c7a026 100644
--- 
a/platforms/spring-boot/components-starter/camel-ahc-starter/src/main/java/org/apache/camel/component/ahc/springboot/AhcComponentAutoConfiguration.java
+++ 
b/platforms/spring-boot/components-starter/camel-ahc-starter/src/main/java/org/apache/camel/component/ahc/springboot/AhcComponentAutoConfiguration.java
@@ -25,6 +25,7 @@ import org.apache.camel.component.ahc.AhcComponent;
 import org.apache.camel.spi.ComponentCustomizer;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 import org.apache.camel.spring.boot.ComponentConfigurationProperties;
+import 
org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.GroupCondition;
 import org.apache.camel.util.IntrospectionSupport;
 import org.apache.camel.util.ObjectHelper;
@@ -32,9 +33,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
 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;
 import org.springframework.context.annotation.Bean;
@@ -47,11 +46,12 @@ import org.springframework.context.annotation.Lazy;
  */
 @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
 @Configuration
-@Conditional(AhcComponentAutoConfiguration.Condition.class)
+@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class,
+        AhcComponentAutoConfiguration.GroupConditions.class})
 @AutoConfigureAfter(CamelAutoConfiguration.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,
         AhcComponentConfiguration.class})
-public class AhcComponentAutoConfiguration extends AllNestedConditions {
+public class AhcComponentAutoConfiguration {
 
     private static final Logger LOGGER = LoggerFactory
             .getLogger(AhcComponentAutoConfiguration.class);
@@ -64,27 +64,14 @@ public class AhcComponentAutoConfiguration extends 
AllNestedConditions {
     @Autowired
     private AhcComponentConfiguration componentConfiguration;
 
-    public AhcComponentAutoConfiguration() {
-        super(ConfigurationPhase.REGISTER_BEAN);
-    }
-
-    @ConditionalOnBean(CamelContext.class)
-    public static class OnCamelContext {
-    }
-
-    @ConditionalOnBean(CamelAutoConfiguration.class)
-    public static class OnCamelAutoConfiguration {
-    }
-
-    public static class Condition extends GroupCondition {
-        public Condition() {
+    static class GroupConditions extends GroupCondition {
+        public GroupConditions() {
             super("camel.component", "camel.component.ahc");
         }
     }
 
     @Lazy
     @Bean(name = "ahc-component")
-    @ConditionalOnClass(CamelContext.class)
     @ConditionalOnMissingBean(AhcComponent.class)
     public AhcComponent configureAhcComponent() throws Exception {
         AhcComponent component = new AhcComponent();

http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-ahc-ws-starter/src/main/java/org/apache/camel/component/ahc/ws/springboot/WsComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git 
a/platforms/spring-boot/components-starter/camel-ahc-ws-starter/src/main/java/org/apache/camel/component/ahc/ws/springboot/WsComponentAutoConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-ahc-ws-starter/src/main/java/org/apache/camel/component/ahc/ws/springboot/WsComponentAutoConfiguration.java
index 9704e91..42f6a5b 100644
--- 
a/platforms/spring-boot/components-starter/camel-ahc-ws-starter/src/main/java/org/apache/camel/component/ahc/ws/springboot/WsComponentAutoConfiguration.java
+++ 
b/platforms/spring-boot/components-starter/camel-ahc-ws-starter/src/main/java/org/apache/camel/component/ahc/ws/springboot/WsComponentAutoConfiguration.java
@@ -25,6 +25,7 @@ import org.apache.camel.component.ahc.ws.WsComponent;
 import org.apache.camel.spi.ComponentCustomizer;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 import org.apache.camel.spring.boot.ComponentConfigurationProperties;
+import 
org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.GroupCondition;
 import org.apache.camel.util.IntrospectionSupport;
 import org.apache.camel.util.ObjectHelper;
@@ -32,9 +33,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
 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;
 import org.springframework.context.annotation.Bean;
@@ -47,11 +46,12 @@ import org.springframework.context.annotation.Lazy;
  */
 @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
 @Configuration
-@Conditional(WsComponentAutoConfiguration.Condition.class)
+@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class,
+        WsComponentAutoConfiguration.GroupConditions.class})
 @AutoConfigureAfter(CamelAutoConfiguration.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,
         WsComponentConfiguration.class})
-public class WsComponentAutoConfiguration extends AllNestedConditions {
+public class WsComponentAutoConfiguration {
 
     private static final Logger LOGGER = LoggerFactory
             .getLogger(WsComponentAutoConfiguration.class);
@@ -64,27 +64,14 @@ public class WsComponentAutoConfiguration extends 
AllNestedConditions {
     @Autowired
     private WsComponentConfiguration componentConfiguration;
 
-    public WsComponentAutoConfiguration() {
-        super(ConfigurationPhase.REGISTER_BEAN);
-    }
-
-    @ConditionalOnBean(CamelContext.class)
-    public static class OnCamelContext {
-    }
-
-    @ConditionalOnBean(CamelAutoConfiguration.class)
-    public static class OnCamelAutoConfiguration {
-    }
-
-    public static class Condition extends GroupCondition {
-        public Condition() {
+    static class GroupConditions extends GroupCondition {
+        public GroupConditions() {
             super("camel.component", "camel.component.ahc-ws");
         }
     }
 
     @Lazy
     @Bean(name = {"ahc-ws-component", "ahc-wss-component"})
-    @ConditionalOnClass(CamelContext.class)
     @ConditionalOnMissingBean(WsComponent.class)
     public WsComponent configureWsComponent() throws Exception {
         WsComponent component = new WsComponent();

http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-amqp-starter/src/main/java/org/apache/camel/component/amqp/springboot/AMQPComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git 
a/platforms/spring-boot/components-starter/camel-amqp-starter/src/main/java/org/apache/camel/component/amqp/springboot/AMQPComponentAutoConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-amqp-starter/src/main/java/org/apache/camel/component/amqp/springboot/AMQPComponentAutoConfiguration.java
index 47fc210..7ef0289 100644
--- 
a/platforms/spring-boot/components-starter/camel-amqp-starter/src/main/java/org/apache/camel/component/amqp/springboot/AMQPComponentAutoConfiguration.java
+++ 
b/platforms/spring-boot/components-starter/camel-amqp-starter/src/main/java/org/apache/camel/component/amqp/springboot/AMQPComponentAutoConfiguration.java
@@ -25,6 +25,7 @@ import org.apache.camel.component.amqp.AMQPComponent;
 import org.apache.camel.spi.ComponentCustomizer;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 import org.apache.camel.spring.boot.ComponentConfigurationProperties;
+import 
org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.GroupCondition;
 import org.apache.camel.util.IntrospectionSupport;
 import org.apache.camel.util.ObjectHelper;
@@ -32,9 +33,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
 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;
 import org.springframework.context.annotation.Bean;
@@ -47,11 +46,12 @@ import org.springframework.context.annotation.Lazy;
  */
 @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
 @Configuration
-@Conditional(AMQPComponentAutoConfiguration.Condition.class)
+@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class,
+        AMQPComponentAutoConfiguration.GroupConditions.class})
 @AutoConfigureAfter(CamelAutoConfiguration.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,
         AMQPComponentConfiguration.class})
-public class AMQPComponentAutoConfiguration extends AllNestedConditions {
+public class AMQPComponentAutoConfiguration {
 
     private static final Logger LOGGER = LoggerFactory
             .getLogger(AMQPComponentAutoConfiguration.class);
@@ -64,27 +64,14 @@ public class AMQPComponentAutoConfiguration extends 
AllNestedConditions {
     @Autowired
     private AMQPComponentConfiguration componentConfiguration;
 
-    public AMQPComponentAutoConfiguration() {
-        super(ConfigurationPhase.REGISTER_BEAN);
-    }
-
-    @ConditionalOnBean(CamelContext.class)
-    public static class OnCamelContext {
-    }
-
-    @ConditionalOnBean(CamelAutoConfiguration.class)
-    public static class OnCamelAutoConfiguration {
-    }
-
-    public static class Condition extends GroupCondition {
-        public Condition() {
+    static class GroupConditions extends GroupCondition {
+        public GroupConditions() {
             super("camel.component", "camel.component.amqp");
         }
     }
 
     @Lazy
     @Bean(name = "amqp-component")
-    @ConditionalOnClass(CamelContext.class)
     @ConditionalOnMissingBean(AMQPComponent.class)
     public AMQPComponent configureAMQPComponent() throws Exception {
         AMQPComponent component = new AMQPComponent();

http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-apns-starter/src/main/java/org/apache/camel/component/apns/springboot/ApnsComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git 
a/platforms/spring-boot/components-starter/camel-apns-starter/src/main/java/org/apache/camel/component/apns/springboot/ApnsComponentAutoConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-apns-starter/src/main/java/org/apache/camel/component/apns/springboot/ApnsComponentAutoConfiguration.java
index c1961f0..68405cf 100644
--- 
a/platforms/spring-boot/components-starter/camel-apns-starter/src/main/java/org/apache/camel/component/apns/springboot/ApnsComponentAutoConfiguration.java
+++ 
b/platforms/spring-boot/components-starter/camel-apns-starter/src/main/java/org/apache/camel/component/apns/springboot/ApnsComponentAutoConfiguration.java
@@ -25,6 +25,7 @@ import org.apache.camel.component.apns.ApnsComponent;
 import org.apache.camel.spi.ComponentCustomizer;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 import org.apache.camel.spring.boot.ComponentConfigurationProperties;
+import 
org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.GroupCondition;
 import org.apache.camel.util.IntrospectionSupport;
 import org.apache.camel.util.ObjectHelper;
@@ -32,9 +33,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
 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;
 import org.springframework.context.annotation.Bean;
@@ -47,11 +46,12 @@ import org.springframework.context.annotation.Lazy;
  */
 @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
 @Configuration
-@Conditional(ApnsComponentAutoConfiguration.Condition.class)
+@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class,
+        ApnsComponentAutoConfiguration.GroupConditions.class})
 @AutoConfigureAfter(CamelAutoConfiguration.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,
         ApnsComponentConfiguration.class})
-public class ApnsComponentAutoConfiguration extends AllNestedConditions {
+public class ApnsComponentAutoConfiguration {
 
     private static final Logger LOGGER = LoggerFactory
             .getLogger(ApnsComponentAutoConfiguration.class);
@@ -64,27 +64,14 @@ public class ApnsComponentAutoConfiguration extends 
AllNestedConditions {
     @Autowired
     private ApnsComponentConfiguration componentConfiguration;
 
-    public ApnsComponentAutoConfiguration() {
-        super(ConfigurationPhase.REGISTER_BEAN);
-    }
-
-    @ConditionalOnBean(CamelContext.class)
-    public static class OnCamelContext {
-    }
-
-    @ConditionalOnBean(CamelAutoConfiguration.class)
-    public static class OnCamelAutoConfiguration {
-    }
-
-    public static class Condition extends GroupCondition {
-        public Condition() {
+    static class GroupConditions extends GroupCondition {
+        public GroupConditions() {
             super("camel.component", "camel.component.apns");
         }
     }
 
     @Lazy
     @Bean(name = "apns-component")
-    @ConditionalOnClass(CamelContext.class)
     @ConditionalOnMissingBean(ApnsComponent.class)
     public ApnsComponent configureApnsComponent() throws Exception {
         ApnsComponent component = new ApnsComponent();

http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-asterisk-starter/src/main/java/org/apache/camel/component/asterisk/springboot/AsteriskComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git 
a/platforms/spring-boot/components-starter/camel-asterisk-starter/src/main/java/org/apache/camel/component/asterisk/springboot/AsteriskComponentAutoConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-asterisk-starter/src/main/java/org/apache/camel/component/asterisk/springboot/AsteriskComponentAutoConfiguration.java
index 61eacbf..66d591d 100644
--- 
a/platforms/spring-boot/components-starter/camel-asterisk-starter/src/main/java/org/apache/camel/component/asterisk/springboot/AsteriskComponentAutoConfiguration.java
+++ 
b/platforms/spring-boot/components-starter/camel-asterisk-starter/src/main/java/org/apache/camel/component/asterisk/springboot/AsteriskComponentAutoConfiguration.java
@@ -25,6 +25,7 @@ import org.apache.camel.component.asterisk.AsteriskComponent;
 import org.apache.camel.spi.ComponentCustomizer;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 import org.apache.camel.spring.boot.ComponentConfigurationProperties;
+import 
org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.GroupCondition;
 import org.apache.camel.util.IntrospectionSupport;
 import org.apache.camel.util.ObjectHelper;
@@ -32,9 +33,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
 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;
 import org.springframework.context.annotation.Bean;
@@ -47,11 +46,12 @@ import org.springframework.context.annotation.Lazy;
  */
 @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
 @Configuration
-@Conditional(AsteriskComponentAutoConfiguration.Condition.class)
+@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class,
+        AsteriskComponentAutoConfiguration.GroupConditions.class})
 @AutoConfigureAfter(CamelAutoConfiguration.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,
         AsteriskComponentConfiguration.class})
-public class AsteriskComponentAutoConfiguration extends AllNestedConditions {
+public class AsteriskComponentAutoConfiguration {
 
     private static final Logger LOGGER = LoggerFactory
             .getLogger(AsteriskComponentAutoConfiguration.class);
@@ -64,27 +64,14 @@ public class AsteriskComponentAutoConfiguration extends 
AllNestedConditions {
     @Autowired
     private AsteriskComponentConfiguration componentConfiguration;
 
-    public AsteriskComponentAutoConfiguration() {
-        super(ConfigurationPhase.REGISTER_BEAN);
-    }
-
-    @ConditionalOnBean(CamelContext.class)
-    public static class OnCamelContext {
-    }
-
-    @ConditionalOnBean(CamelAutoConfiguration.class)
-    public static class OnCamelAutoConfiguration {
-    }
-
-    public static class Condition extends GroupCondition {
-        public Condition() {
+    static class GroupConditions extends GroupCondition {
+        public GroupConditions() {
             super("camel.component", "camel.component.asterisk");
         }
     }
 
     @Lazy
     @Bean(name = "asterisk-component")
-    @ConditionalOnClass(CamelContext.class)
     @ConditionalOnMissingBean(AsteriskComponent.class)
     public AsteriskComponent configureAsteriskComponent() throws Exception {
         AsteriskComponent component = new AsteriskComponent();

http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-atmos-starter/src/main/java/org/apache/camel/component/atmos/springboot/AtmosComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git 
a/platforms/spring-boot/components-starter/camel-atmos-starter/src/main/java/org/apache/camel/component/atmos/springboot/AtmosComponentAutoConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-atmos-starter/src/main/java/org/apache/camel/component/atmos/springboot/AtmosComponentAutoConfiguration.java
index 42656ba..a97ff18 100644
--- 
a/platforms/spring-boot/components-starter/camel-atmos-starter/src/main/java/org/apache/camel/component/atmos/springboot/AtmosComponentAutoConfiguration.java
+++ 
b/platforms/spring-boot/components-starter/camel-atmos-starter/src/main/java/org/apache/camel/component/atmos/springboot/AtmosComponentAutoConfiguration.java
@@ -25,6 +25,7 @@ import org.apache.camel.component.atmos.AtmosComponent;
 import org.apache.camel.spi.ComponentCustomizer;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 import org.apache.camel.spring.boot.ComponentConfigurationProperties;
+import 
org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.GroupCondition;
 import org.apache.camel.util.IntrospectionSupport;
 import org.apache.camel.util.ObjectHelper;
@@ -32,9 +33,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
 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;
 import org.springframework.context.annotation.Bean;
@@ -47,11 +46,12 @@ import org.springframework.context.annotation.Lazy;
  */
 @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
 @Configuration
-@Conditional(AtmosComponentAutoConfiguration.Condition.class)
+@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class,
+        AtmosComponentAutoConfiguration.GroupConditions.class})
 @AutoConfigureAfter(CamelAutoConfiguration.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,
         AtmosComponentConfiguration.class})
-public class AtmosComponentAutoConfiguration extends AllNestedConditions {
+public class AtmosComponentAutoConfiguration {
 
     private static final Logger LOGGER = LoggerFactory
             .getLogger(AtmosComponentAutoConfiguration.class);
@@ -64,27 +64,14 @@ public class AtmosComponentAutoConfiguration extends 
AllNestedConditions {
     @Autowired
     private AtmosComponentConfiguration componentConfiguration;
 
-    public AtmosComponentAutoConfiguration() {
-        super(ConfigurationPhase.REGISTER_BEAN);
-    }
-
-    @ConditionalOnBean(CamelContext.class)
-    public static class OnCamelContext {
-    }
-
-    @ConditionalOnBean(CamelAutoConfiguration.class)
-    public static class OnCamelAutoConfiguration {
-    }
-
-    public static class Condition extends GroupCondition {
-        public Condition() {
+    static class GroupConditions extends GroupCondition {
+        public GroupConditions() {
             super("camel.component", "camel.component.atmos");
         }
     }
 
     @Lazy
     @Bean(name = "atmos-component")
-    @ConditionalOnClass(CamelContext.class)
     @ConditionalOnMissingBean(AtmosComponent.class)
     public AtmosComponent configureAtmosComponent() throws Exception {
         AtmosComponent component = new AtmosComponent();

http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git 
a/platforms/spring-boot/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentAutoConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentAutoConfiguration.java
index 1e8171e..7b21fe5 100644
--- 
a/platforms/spring-boot/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentAutoConfiguration.java
+++ 
b/platforms/spring-boot/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentAutoConfiguration.java
@@ -25,6 +25,7 @@ import 
org.apache.camel.component.atmosphere.websocket.WebsocketComponent;
 import org.apache.camel.spi.ComponentCustomizer;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 import org.apache.camel.spring.boot.ComponentConfigurationProperties;
+import 
org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.GroupCondition;
 import org.apache.camel.util.IntrospectionSupport;
 import org.apache.camel.util.ObjectHelper;
@@ -32,9 +33,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
 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;
 import org.springframework.context.annotation.Bean;
@@ -47,11 +46,12 @@ import org.springframework.context.annotation.Lazy;
  */
 @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
 @Configuration
-@Conditional(WebsocketComponentAutoConfiguration.Condition.class)
+@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class,
+        WebsocketComponentAutoConfiguration.GroupConditions.class})
 @AutoConfigureAfter(CamelAutoConfiguration.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,
         WebsocketComponentConfiguration.class})
-public class WebsocketComponentAutoConfiguration extends AllNestedConditions {
+public class WebsocketComponentAutoConfiguration {
 
     private static final Logger LOGGER = LoggerFactory
             .getLogger(WebsocketComponentAutoConfiguration.class);
@@ -64,27 +64,14 @@ public class WebsocketComponentAutoConfiguration extends 
AllNestedConditions {
     @Autowired
     private WebsocketComponentConfiguration componentConfiguration;
 
-    public WebsocketComponentAutoConfiguration() {
-        super(ConfigurationPhase.REGISTER_BEAN);
-    }
-
-    @ConditionalOnBean(CamelContext.class)
-    public static class OnCamelContext {
-    }
-
-    @ConditionalOnBean(CamelAutoConfiguration.class)
-    public static class OnCamelAutoConfiguration {
-    }
-
-    public static class Condition extends GroupCondition {
-        public Condition() {
+    static class GroupConditions extends GroupCondition {
+        public GroupConditions() {
             super("camel.component", "camel.component.atmosphere-websocket");
         }
     }
 
     @Lazy
     @Bean(name = "atmosphere-websocket-component")
-    @ConditionalOnClass(CamelContext.class)
     @ConditionalOnMissingBean(WebsocketComponent.class)
     public WebsocketComponent configureWebsocketComponent() throws Exception {
         WebsocketComponent component = new WebsocketComponent();

http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-atom-starter/src/main/java/org/apache/camel/component/atom/springboot/AtomComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git 
a/platforms/spring-boot/components-starter/camel-atom-starter/src/main/java/org/apache/camel/component/atom/springboot/AtomComponentAutoConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-atom-starter/src/main/java/org/apache/camel/component/atom/springboot/AtomComponentAutoConfiguration.java
index 28f70c0..5f68096 100644
--- 
a/platforms/spring-boot/components-starter/camel-atom-starter/src/main/java/org/apache/camel/component/atom/springboot/AtomComponentAutoConfiguration.java
+++ 
b/platforms/spring-boot/components-starter/camel-atom-starter/src/main/java/org/apache/camel/component/atom/springboot/AtomComponentAutoConfiguration.java
@@ -25,6 +25,7 @@ import org.apache.camel.component.atom.AtomComponent;
 import org.apache.camel.spi.ComponentCustomizer;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 import org.apache.camel.spring.boot.ComponentConfigurationProperties;
+import 
org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.GroupCondition;
 import org.apache.camel.util.IntrospectionSupport;
 import org.apache.camel.util.ObjectHelper;
@@ -32,9 +33,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
 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;
 import org.springframework.context.annotation.Bean;
@@ -47,11 +46,12 @@ import org.springframework.context.annotation.Lazy;
  */
 @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
 @Configuration
-@Conditional(AtomComponentAutoConfiguration.Condition.class)
+@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class,
+        AtomComponentAutoConfiguration.GroupConditions.class})
 @AutoConfigureAfter(CamelAutoConfiguration.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,
         AtomComponentConfiguration.class})
-public class AtomComponentAutoConfiguration extends AllNestedConditions {
+public class AtomComponentAutoConfiguration {
 
     private static final Logger LOGGER = LoggerFactory
             .getLogger(AtomComponentAutoConfiguration.class);
@@ -64,27 +64,14 @@ public class AtomComponentAutoConfiguration extends 
AllNestedConditions {
     @Autowired
     private AtomComponentConfiguration componentConfiguration;
 
-    public AtomComponentAutoConfiguration() {
-        super(ConfigurationPhase.REGISTER_BEAN);
-    }
-
-    @ConditionalOnBean(CamelContext.class)
-    public static class OnCamelContext {
-    }
-
-    @ConditionalOnBean(CamelAutoConfiguration.class)
-    public static class OnCamelAutoConfiguration {
-    }
-
-    public static class Condition extends GroupCondition {
-        public Condition() {
+    static class GroupConditions extends GroupCondition {
+        public GroupConditions() {
             super("camel.component", "camel.component.atom");
         }
     }
 
     @Lazy
     @Bean(name = "atom-component")
-    @ConditionalOnClass(CamelContext.class)
     @ConditionalOnMissingBean(AtomComponent.class)
     public AtomComponent configureAtomComponent() throws Exception {
         AtomComponent component = new AtomComponent();

http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-avro-starter/src/main/java/org/apache/camel/component/avro/springboot/AvroComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git 
a/platforms/spring-boot/components-starter/camel-avro-starter/src/main/java/org/apache/camel/component/avro/springboot/AvroComponentAutoConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-avro-starter/src/main/java/org/apache/camel/component/avro/springboot/AvroComponentAutoConfiguration.java
index ee751b6..ea776c9 100644
--- 
a/platforms/spring-boot/components-starter/camel-avro-starter/src/main/java/org/apache/camel/component/avro/springboot/AvroComponentAutoConfiguration.java
+++ 
b/platforms/spring-boot/components-starter/camel-avro-starter/src/main/java/org/apache/camel/component/avro/springboot/AvroComponentAutoConfiguration.java
@@ -25,6 +25,7 @@ import org.apache.camel.component.avro.AvroComponent;
 import org.apache.camel.spi.ComponentCustomizer;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 import org.apache.camel.spring.boot.ComponentConfigurationProperties;
+import 
org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.GroupCondition;
 import org.apache.camel.util.IntrospectionSupport;
 import org.apache.camel.util.ObjectHelper;
@@ -32,9 +33,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
 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;
 import org.springframework.context.annotation.Bean;
@@ -47,11 +46,12 @@ import org.springframework.context.annotation.Lazy;
  */
 @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
 @Configuration
-@Conditional(AvroComponentAutoConfiguration.Condition.class)
+@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class,
+        AvroComponentAutoConfiguration.GroupConditions.class})
 @AutoConfigureAfter(CamelAutoConfiguration.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,
         AvroComponentConfiguration.class})
-public class AvroComponentAutoConfiguration extends AllNestedConditions {
+public class AvroComponentAutoConfiguration {
 
     private static final Logger LOGGER = LoggerFactory
             .getLogger(AvroComponentAutoConfiguration.class);
@@ -64,27 +64,14 @@ public class AvroComponentAutoConfiguration extends 
AllNestedConditions {
     @Autowired
     private AvroComponentConfiguration componentConfiguration;
 
-    public AvroComponentAutoConfiguration() {
-        super(ConfigurationPhase.REGISTER_BEAN);
-    }
-
-    @ConditionalOnBean(CamelContext.class)
-    public static class OnCamelContext {
-    }
-
-    @ConditionalOnBean(CamelAutoConfiguration.class)
-    public static class OnCamelAutoConfiguration {
-    }
-
-    public static class Condition extends GroupCondition {
-        public Condition() {
+    static class GroupConditions extends GroupCondition {
+        public GroupConditions() {
             super("camel.component", "camel.component.avro");
         }
     }
 
     @Lazy
     @Bean(name = "avro-component")
-    @ConditionalOnClass(CamelContext.class)
     @ConditionalOnMissingBean(AvroComponent.class)
     public AvroComponent configureAvroComponent() throws Exception {
         AvroComponent component = new AvroComponent();

http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-avro-starter/src/main/java/org/apache/camel/dataformat/avro/springboot/AvroDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git 
a/platforms/spring-boot/components-starter/camel-avro-starter/src/main/java/org/apache/camel/dataformat/avro/springboot/AvroDataFormatAutoConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-avro-starter/src/main/java/org/apache/camel/dataformat/avro/springboot/AvroDataFormatAutoConfiguration.java
index 470437f..ac045be 100644
--- 
a/platforms/spring-boot/components-starter/camel-avro-starter/src/main/java/org/apache/camel/dataformat/avro/springboot/AvroDataFormatAutoConfiguration.java
+++ 
b/platforms/spring-boot/components-starter/camel-avro-starter/src/main/java/org/apache/camel/dataformat/avro/springboot/AvroDataFormatAutoConfiguration.java
@@ -29,6 +29,7 @@ import org.apache.camel.spi.DataFormatCustomizer;
 import org.apache.camel.spi.DataFormatFactory;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 import org.apache.camel.spring.boot.DataFormatConfigurationProperties;
+import 
org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.GroupCondition;
 import org.apache.camel.util.IntrospectionSupport;
 import org.apache.camel.util.ObjectHelper;
@@ -36,9 +37,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
 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;
 import org.springframework.context.annotation.Bean;
@@ -50,11 +49,12 @@ import org.springframework.context.annotation.Configuration;
  */
 @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
 @Configuration
-@Conditional(AvroDataFormatAutoConfiguration.Condition.class)
+@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class,
+        AvroDataFormatAutoConfiguration.GroupConditions.class})
 @AutoConfigureAfter(name = 
"org.apache.camel.spring.boot.CamelAutoConfiguration")
 @EnableConfigurationProperties({DataFormatConfigurationProperties.class,
         AvroDataFormatConfiguration.class})
-public class AvroDataFormatAutoConfiguration extends AllNestedConditions {
+public class AvroDataFormatAutoConfiguration {
 
     private static final Logger LOGGER = LoggerFactory
             .getLogger(AvroDataFormatAutoConfiguration.class);
@@ -67,30 +67,17 @@ public class AvroDataFormatAutoConfiguration extends 
AllNestedConditions {
     @Autowired
     private AvroDataFormatConfiguration dataformatConfiguration;
 
-    public AvroDataFormatAutoConfiguration() {
-        super(ConfigurationPhase.REGISTER_BEAN);
-    }
-
-    @ConditionalOnBean(CamelContext.class)
-    public static class OnCamelContext {
-    }
-
-    @ConditionalOnBean(CamelAutoConfiguration.class)
-    public static class OnCamelAutoConfiguration {
-    }
-
-    @ConditionalOnBean(CamelAutoConfiguration.class)
-    public static class Condition extends GroupCondition {
-        public Condition() {
+    static class GroupConditions extends GroupCondition {
+        public GroupConditions() {
             super("camel.dataformat", "camel.dataformat.avro");
         }
     }
 
     @Bean(name = "avro-dataformat-factory")
-    @ConditionalOnClass(CamelContext.class)
     @ConditionalOnMissingBean(AvroDataFormat.class)
     public DataFormatFactory configureAvroDataFormatFactory() throws Exception 
{
         return new DataFormatFactory() {
+            @Override
             public DataFormat newInstance() {
                 AvroDataFormat dataformat = new AvroDataFormat();
                 if (CamelContextAware.class

http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/cw/springboot/CwComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git 
a/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/cw/springboot/CwComponentAutoConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/cw/springboot/CwComponentAutoConfiguration.java
index 33e9d8e..25c6ee7 100644
--- 
a/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/cw/springboot/CwComponentAutoConfiguration.java
+++ 
b/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/cw/springboot/CwComponentAutoConfiguration.java
@@ -25,6 +25,7 @@ import org.apache.camel.component.aws.cw.CwComponent;
 import org.apache.camel.spi.ComponentCustomizer;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 import org.apache.camel.spring.boot.ComponentConfigurationProperties;
+import 
org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.GroupCondition;
 import org.apache.camel.util.IntrospectionSupport;
 import org.apache.camel.util.ObjectHelper;
@@ -32,9 +33,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
 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;
 import org.springframework.context.annotation.Bean;
@@ -47,11 +46,12 @@ import org.springframework.context.annotation.Lazy;
  */
 @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
 @Configuration
-@Conditional(CwComponentAutoConfiguration.Condition.class)
+@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class,
+        CwComponentAutoConfiguration.GroupConditions.class})
 @AutoConfigureAfter(CamelAutoConfiguration.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,
         CwComponentConfiguration.class})
-public class CwComponentAutoConfiguration extends AllNestedConditions {
+public class CwComponentAutoConfiguration {
 
     private static final Logger LOGGER = LoggerFactory
             .getLogger(CwComponentAutoConfiguration.class);
@@ -64,27 +64,14 @@ public class CwComponentAutoConfiguration extends 
AllNestedConditions {
     @Autowired
     private CwComponentConfiguration componentConfiguration;
 
-    public CwComponentAutoConfiguration() {
-        super(ConfigurationPhase.REGISTER_BEAN);
-    }
-
-    @ConditionalOnBean(CamelContext.class)
-    public static class OnCamelContext {
-    }
-
-    @ConditionalOnBean(CamelAutoConfiguration.class)
-    public static class OnCamelAutoConfiguration {
-    }
-
-    public static class Condition extends GroupCondition {
-        public Condition() {
+    static class GroupConditions extends GroupCondition {
+        public GroupConditions() {
             super("camel.component", "camel.component.aws-cw");
         }
     }
 
     @Lazy
     @Bean(name = "aws-cw-component")
-    @ConditionalOnClass(CamelContext.class)
     @ConditionalOnMissingBean(CwComponent.class)
     public CwComponent configureCwComponent() throws Exception {
         CwComponent component = new CwComponent();

http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/ddb/springboot/DdbComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git 
a/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/ddb/springboot/DdbComponentAutoConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/ddb/springboot/DdbComponentAutoConfiguration.java
index c1046ea..67f3dbf 100644
--- 
a/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/ddb/springboot/DdbComponentAutoConfiguration.java
+++ 
b/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/ddb/springboot/DdbComponentAutoConfiguration.java
@@ -25,6 +25,7 @@ import org.apache.camel.component.aws.ddb.DdbComponent;
 import org.apache.camel.spi.ComponentCustomizer;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 import org.apache.camel.spring.boot.ComponentConfigurationProperties;
+import 
org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.GroupCondition;
 import org.apache.camel.util.IntrospectionSupport;
 import org.apache.camel.util.ObjectHelper;
@@ -32,9 +33,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
 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;
 import org.springframework.context.annotation.Bean;
@@ -47,11 +46,12 @@ import org.springframework.context.annotation.Lazy;
  */
 @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
 @Configuration
-@Conditional(DdbComponentAutoConfiguration.Condition.class)
+@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class,
+        DdbComponentAutoConfiguration.GroupConditions.class})
 @AutoConfigureAfter(CamelAutoConfiguration.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,
         DdbComponentConfiguration.class})
-public class DdbComponentAutoConfiguration extends AllNestedConditions {
+public class DdbComponentAutoConfiguration {
 
     private static final Logger LOGGER = LoggerFactory
             .getLogger(DdbComponentAutoConfiguration.class);
@@ -64,27 +64,14 @@ public class DdbComponentAutoConfiguration extends 
AllNestedConditions {
     @Autowired
     private DdbComponentConfiguration componentConfiguration;
 
-    public DdbComponentAutoConfiguration() {
-        super(ConfigurationPhase.REGISTER_BEAN);
-    }
-
-    @ConditionalOnBean(CamelContext.class)
-    public static class OnCamelContext {
-    }
-
-    @ConditionalOnBean(CamelAutoConfiguration.class)
-    public static class OnCamelAutoConfiguration {
-    }
-
-    public static class Condition extends GroupCondition {
-        public Condition() {
+    static class GroupConditions extends GroupCondition {
+        public GroupConditions() {
             super("camel.component", "camel.component.aws-ddb");
         }
     }
 
     @Lazy
     @Bean(name = "aws-ddb-component")
-    @ConditionalOnClass(CamelContext.class)
     @ConditionalOnMissingBean(DdbComponent.class)
     public DdbComponent configureDdbComponent() throws Exception {
         DdbComponent component = new DdbComponent();

http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/ddbstream/springboot/DdbStreamComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git 
a/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/ddbstream/springboot/DdbStreamComponentAutoConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/ddbstream/springboot/DdbStreamComponentAutoConfiguration.java
index 101f255..5dbe1a1 100644
--- 
a/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/ddbstream/springboot/DdbStreamComponentAutoConfiguration.java
+++ 
b/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/ddbstream/springboot/DdbStreamComponentAutoConfiguration.java
@@ -25,6 +25,7 @@ import 
org.apache.camel.component.aws.ddbstream.DdbStreamComponent;
 import org.apache.camel.spi.ComponentCustomizer;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 import org.apache.camel.spring.boot.ComponentConfigurationProperties;
+import 
org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.GroupCondition;
 import org.apache.camel.util.IntrospectionSupport;
 import org.apache.camel.util.ObjectHelper;
@@ -32,9 +33,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
 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;
 import org.springframework.context.annotation.Bean;
@@ -47,11 +46,12 @@ import org.springframework.context.annotation.Lazy;
  */
 @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
 @Configuration
-@Conditional(DdbStreamComponentAutoConfiguration.Condition.class)
+@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class,
+        DdbStreamComponentAutoConfiguration.GroupConditions.class})
 @AutoConfigureAfter(CamelAutoConfiguration.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,
         DdbStreamComponentConfiguration.class})
-public class DdbStreamComponentAutoConfiguration extends AllNestedConditions {
+public class DdbStreamComponentAutoConfiguration {
 
     private static final Logger LOGGER = LoggerFactory
             .getLogger(DdbStreamComponentAutoConfiguration.class);
@@ -64,27 +64,14 @@ public class DdbStreamComponentAutoConfiguration extends 
AllNestedConditions {
     @Autowired
     private DdbStreamComponentConfiguration componentConfiguration;
 
-    public DdbStreamComponentAutoConfiguration() {
-        super(ConfigurationPhase.REGISTER_BEAN);
-    }
-
-    @ConditionalOnBean(CamelContext.class)
-    public static class OnCamelContext {
-    }
-
-    @ConditionalOnBean(CamelAutoConfiguration.class)
-    public static class OnCamelAutoConfiguration {
-    }
-
-    public static class Condition extends GroupCondition {
-        public Condition() {
+    static class GroupConditions extends GroupCondition {
+        public GroupConditions() {
             super("camel.component", "camel.component.aws-ddbstream");
         }
     }
 
     @Lazy
     @Bean(name = "aws-ddbstream-component")
-    @ConditionalOnClass(CamelContext.class)
     @ConditionalOnMissingBean(DdbStreamComponent.class)
     public DdbStreamComponent configureDdbStreamComponent() throws Exception {
         DdbStreamComponent component = new DdbStreamComponent();

http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/ec2/springboot/EC2ComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git 
a/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/ec2/springboot/EC2ComponentAutoConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/ec2/springboot/EC2ComponentAutoConfiguration.java
index 10ea38f..2a46ea7 100644
--- 
a/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/ec2/springboot/EC2ComponentAutoConfiguration.java
+++ 
b/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/ec2/springboot/EC2ComponentAutoConfiguration.java
@@ -25,6 +25,7 @@ import org.apache.camel.component.aws.ec2.EC2Component;
 import org.apache.camel.spi.ComponentCustomizer;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 import org.apache.camel.spring.boot.ComponentConfigurationProperties;
+import 
org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.GroupCondition;
 import org.apache.camel.util.IntrospectionSupport;
 import org.apache.camel.util.ObjectHelper;
@@ -32,9 +33,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
 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;
 import org.springframework.context.annotation.Bean;
@@ -47,11 +46,12 @@ import org.springframework.context.annotation.Lazy;
  */
 @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
 @Configuration
-@Conditional(EC2ComponentAutoConfiguration.Condition.class)
+@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class,
+        EC2ComponentAutoConfiguration.GroupConditions.class})
 @AutoConfigureAfter(CamelAutoConfiguration.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,
         EC2ComponentConfiguration.class})
-public class EC2ComponentAutoConfiguration extends AllNestedConditions {
+public class EC2ComponentAutoConfiguration {
 
     private static final Logger LOGGER = LoggerFactory
             .getLogger(EC2ComponentAutoConfiguration.class);
@@ -64,27 +64,14 @@ public class EC2ComponentAutoConfiguration extends 
AllNestedConditions {
     @Autowired
     private EC2ComponentConfiguration componentConfiguration;
 
-    public EC2ComponentAutoConfiguration() {
-        super(ConfigurationPhase.REGISTER_BEAN);
-    }
-
-    @ConditionalOnBean(CamelContext.class)
-    public static class OnCamelContext {
-    }
-
-    @ConditionalOnBean(CamelAutoConfiguration.class)
-    public static class OnCamelAutoConfiguration {
-    }
-
-    public static class Condition extends GroupCondition {
-        public Condition() {
+    static class GroupConditions extends GroupCondition {
+        public GroupConditions() {
             super("camel.component", "camel.component.aws-ec2");
         }
     }
 
     @Lazy
     @Bean(name = "aws-ec2-component")
-    @ConditionalOnClass(CamelContext.class)
     @ConditionalOnMissingBean(EC2Component.class)
     public EC2Component configureEC2Component() throws Exception {
         EC2Component component = new EC2Component();

http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/firehose/springboot/KinesisFirehoseComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git 
a/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/firehose/springboot/KinesisFirehoseComponentAutoConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/firehose/springboot/KinesisFirehoseComponentAutoConfiguration.java
index 84177ef..b8aca0d 100644
--- 
a/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/firehose/springboot/KinesisFirehoseComponentAutoConfiguration.java
+++ 
b/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/firehose/springboot/KinesisFirehoseComponentAutoConfiguration.java
@@ -25,6 +25,7 @@ import 
org.apache.camel.component.aws.firehose.KinesisFirehoseComponent;
 import org.apache.camel.spi.ComponentCustomizer;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 import org.apache.camel.spring.boot.ComponentConfigurationProperties;
+import 
org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.GroupCondition;
 import org.apache.camel.util.IntrospectionSupport;
 import org.apache.camel.util.ObjectHelper;
@@ -32,9 +33,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
 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;
 import org.springframework.context.annotation.Bean;
@@ -47,13 +46,12 @@ import org.springframework.context.annotation.Lazy;
  */
 @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
 @Configuration
-@Conditional(KinesisFirehoseComponentAutoConfiguration.Condition.class)
+@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class,
+        KinesisFirehoseComponentAutoConfiguration.GroupConditions.class})
 @AutoConfigureAfter(CamelAutoConfiguration.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,
         KinesisFirehoseComponentConfiguration.class})
-public class KinesisFirehoseComponentAutoConfiguration
-        extends
-            AllNestedConditions {
+public class KinesisFirehoseComponentAutoConfiguration {
 
     private static final Logger LOGGER = LoggerFactory
             .getLogger(KinesisFirehoseComponentAutoConfiguration.class);
@@ -66,27 +64,14 @@ public class KinesisFirehoseComponentAutoConfiguration
     @Autowired
     private KinesisFirehoseComponentConfiguration componentConfiguration;
 
-    public KinesisFirehoseComponentAutoConfiguration() {
-        super(ConfigurationPhase.REGISTER_BEAN);
-    }
-
-    @ConditionalOnBean(CamelContext.class)
-    public static class OnCamelContext {
-    }
-
-    @ConditionalOnBean(CamelAutoConfiguration.class)
-    public static class OnCamelAutoConfiguration {
-    }
-
-    public static class Condition extends GroupCondition {
-        public Condition() {
+    static class GroupConditions extends GroupCondition {
+        public GroupConditions() {
             super("camel.component", "camel.component.aws-kinesis-firehose");
         }
     }
 
     @Lazy
     @Bean(name = "aws-kinesis-firehose-component")
-    @ConditionalOnClass(CamelContext.class)
     @ConditionalOnMissingBean(KinesisFirehoseComponent.class)
     public KinesisFirehoseComponent configureKinesisFirehoseComponent()
             throws Exception {

http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/kinesis/springboot/KinesisComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git 
a/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/kinesis/springboot/KinesisComponentAutoConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/kinesis/springboot/KinesisComponentAutoConfiguration.java
index 32941a1..8932839 100644
--- 
a/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/kinesis/springboot/KinesisComponentAutoConfiguration.java
+++ 
b/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/kinesis/springboot/KinesisComponentAutoConfiguration.java
@@ -25,6 +25,7 @@ import 
org.apache.camel.component.aws.kinesis.KinesisComponent;
 import org.apache.camel.spi.ComponentCustomizer;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 import org.apache.camel.spring.boot.ComponentConfigurationProperties;
+import 
org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.GroupCondition;
 import org.apache.camel.util.IntrospectionSupport;
 import org.apache.camel.util.ObjectHelper;
@@ -32,9 +33,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
 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;
 import org.springframework.context.annotation.Bean;
@@ -47,11 +46,12 @@ import org.springframework.context.annotation.Lazy;
  */
 @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
 @Configuration
-@Conditional(KinesisComponentAutoConfiguration.Condition.class)
+@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class,
+        KinesisComponentAutoConfiguration.GroupConditions.class})
 @AutoConfigureAfter(CamelAutoConfiguration.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,
         KinesisComponentConfiguration.class})
-public class KinesisComponentAutoConfiguration extends AllNestedConditions {
+public class KinesisComponentAutoConfiguration {
 
     private static final Logger LOGGER = LoggerFactory
             .getLogger(KinesisComponentAutoConfiguration.class);
@@ -64,27 +64,14 @@ public class KinesisComponentAutoConfiguration extends 
AllNestedConditions {
     @Autowired
     private KinesisComponentConfiguration componentConfiguration;
 
-    public KinesisComponentAutoConfiguration() {
-        super(ConfigurationPhase.REGISTER_BEAN);
-    }
-
-    @ConditionalOnBean(CamelContext.class)
-    public static class OnCamelContext {
-    }
-
-    @ConditionalOnBean(CamelAutoConfiguration.class)
-    public static class OnCamelAutoConfiguration {
-    }
-
-    public static class Condition extends GroupCondition {
-        public Condition() {
+    static class GroupConditions extends GroupCondition {
+        public GroupConditions() {
             super("camel.component", "camel.component.aws-kinesis");
         }
     }
 
     @Lazy
     @Bean(name = "aws-kinesis-component")
-    @ConditionalOnClass(CamelContext.class)
     @ConditionalOnMissingBean(KinesisComponent.class)
     public KinesisComponent configureKinesisComponent() throws Exception {
         KinesisComponent component = new KinesisComponent();

http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/s3/springboot/S3ComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git 
a/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/s3/springboot/S3ComponentAutoConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/s3/springboot/S3ComponentAutoConfiguration.java
index b1a94e1..706af0b 100644
--- 
a/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/s3/springboot/S3ComponentAutoConfiguration.java
+++ 
b/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/s3/springboot/S3ComponentAutoConfiguration.java
@@ -25,6 +25,7 @@ import org.apache.camel.component.aws.s3.S3Component;
 import org.apache.camel.spi.ComponentCustomizer;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 import org.apache.camel.spring.boot.ComponentConfigurationProperties;
+import 
org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.GroupCondition;
 import org.apache.camel.util.IntrospectionSupport;
 import org.apache.camel.util.ObjectHelper;
@@ -32,9 +33,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
 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;
 import org.springframework.context.annotation.Bean;
@@ -47,11 +46,12 @@ import org.springframework.context.annotation.Lazy;
  */
 @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
 @Configuration
-@Conditional(S3ComponentAutoConfiguration.Condition.class)
+@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class,
+        S3ComponentAutoConfiguration.GroupConditions.class})
 @AutoConfigureAfter(CamelAutoConfiguration.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,
         S3ComponentConfiguration.class})
-public class S3ComponentAutoConfiguration extends AllNestedConditions {
+public class S3ComponentAutoConfiguration {
 
     private static final Logger LOGGER = LoggerFactory
             .getLogger(S3ComponentAutoConfiguration.class);
@@ -64,27 +64,14 @@ public class S3ComponentAutoConfiguration extends 
AllNestedConditions {
     @Autowired
     private S3ComponentConfiguration componentConfiguration;
 
-    public S3ComponentAutoConfiguration() {
-        super(ConfigurationPhase.REGISTER_BEAN);
-    }
-
-    @ConditionalOnBean(CamelContext.class)
-    public static class OnCamelContext {
-    }
-
-    @ConditionalOnBean(CamelAutoConfiguration.class)
-    public static class OnCamelAutoConfiguration {
-    }
-
-    public static class Condition extends GroupCondition {
-        public Condition() {
+    static class GroupConditions extends GroupCondition {
+        public GroupConditions() {
             super("camel.component", "camel.component.aws-s3");
         }
     }
 
     @Lazy
     @Bean(name = "aws-s3-component")
-    @ConditionalOnClass(CamelContext.class)
     @ConditionalOnMissingBean(S3Component.class)
     public S3Component configureS3Component() throws Exception {
         S3Component component = new S3Component();

Reply via email to