You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/07/28 13:24:31 UTC
[1/9] camel git commit: Generated classes in camel-core
Repository: camel
Updated Branches:
refs/heads/master d80f93cca -> d0d12f250
Generated classes in camel-core
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d0d12f25
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d0d12f25
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d0d12f25
Branch: refs/heads/master
Commit: d0d12f25027d3e3be346ebb51d09b4d0911798ca
Parents: bad9fc2
Author: Nicola Ferraro <ni...@gmail.com>
Authored: Thu Jul 28 13:24:33 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jul 28 15:24:18 2016 +0200
----------------------------------------------------------------------
.../direct/springboot/DirectComponentAutoConfiguration.java | 2 +-
.../directvm/springboot/DirectVmComponentAutoConfiguration.java | 2 +-
.../component/log/springboot/LogComponentAutoConfiguration.java | 2 +-
.../springboot/PropertiesComponentAutoConfiguration.java | 2 +-
.../scheduler/springboot/SchedulerComponentAutoConfiguration.java | 2 +-
.../component/seda/springboot/SedaComponentAutoConfiguration.java | 2 +-
.../component/stub/springboot/StubComponentAutoConfiguration.java | 2 +-
.../validator/springboot/ValidatorComponentAutoConfiguration.java | 2 +-
.../component/vm/springboot/VmComponentAutoConfiguration.java | 2 +-
.../component/xslt/springboot/XsltComponentAutoConfiguration.java | 2 +-
.../camel/impl/springboot/GzipDataFormatAutoConfiguration.java | 2 +-
.../impl/springboot/SerializationDataFormatAutoConfiguration.java | 2 +-
.../camel/impl/springboot/StringDataFormatAutoConfiguration.java | 2 +-
.../camel/impl/springboot/ZipDataFormatAutoConfiguration.java | 2 +-
14 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d0d12f25/camel-core/src/main/java/org/apache/camel/component/direct/springboot/DirectComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/direct/springboot/DirectComponentAutoConfiguration.java b/camel-core/src/main/java/org/apache/camel/component/direct/springboot/DirectComponentAutoConfiguration.java
index da46175..2a586d3 100644
--- a/camel-core/src/main/java/org/apache/camel/component/direct/springboot/DirectComponentAutoConfiguration.java
+++ b/camel-core/src/main/java/org/apache/camel/component/direct/springboot/DirectComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(DirectComponentConfiguration.class)
public class DirectComponentAutoConfiguration {
- @Bean
+ @Bean(name = "direct-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(DirectComponent.class)
public DirectComponent configureDirectComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/d0d12f25/camel-core/src/main/java/org/apache/camel/component/directvm/springboot/DirectVmComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/directvm/springboot/DirectVmComponentAutoConfiguration.java b/camel-core/src/main/java/org/apache/camel/component/directvm/springboot/DirectVmComponentAutoConfiguration.java
index 3b1551f..d3ea29e 100644
--- a/camel-core/src/main/java/org/apache/camel/component/directvm/springboot/DirectVmComponentAutoConfiguration.java
+++ b/camel-core/src/main/java/org/apache/camel/component/directvm/springboot/DirectVmComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(DirectVmComponentConfiguration.class)
public class DirectVmComponentAutoConfiguration {
- @Bean
+ @Bean(name = "direct-vm-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(DirectVmComponent.class)
public DirectVmComponent configureDirectVmComponent(
http://git-wip-us.apache.org/repos/asf/camel/blob/d0d12f25/camel-core/src/main/java/org/apache/camel/component/log/springboot/LogComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/log/springboot/LogComponentAutoConfiguration.java b/camel-core/src/main/java/org/apache/camel/component/log/springboot/LogComponentAutoConfiguration.java
index c9f5b9f..dcfaa46 100644
--- a/camel-core/src/main/java/org/apache/camel/component/log/springboot/LogComponentAutoConfiguration.java
+++ b/camel-core/src/main/java/org/apache/camel/component/log/springboot/LogComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(LogComponentConfiguration.class)
public class LogComponentAutoConfiguration {
- @Bean
+ @Bean(name = "log-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(LogComponent.class)
public LogComponent configureLogComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/d0d12f25/camel-core/src/main/java/org/apache/camel/component/properties/springboot/PropertiesComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/properties/springboot/PropertiesComponentAutoConfiguration.java b/camel-core/src/main/java/org/apache/camel/component/properties/springboot/PropertiesComponentAutoConfiguration.java
index cc22e16..d4f8fb0 100644
--- a/camel-core/src/main/java/org/apache/camel/component/properties/springboot/PropertiesComponentAutoConfiguration.java
+++ b/camel-core/src/main/java/org/apache/camel/component/properties/springboot/PropertiesComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(PropertiesComponentConfiguration.class)
public class PropertiesComponentAutoConfiguration {
- @Bean
+ @Bean(name = "properties-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(PropertiesComponent.class)
public PropertiesComponent configurePropertiesComponent(
http://git-wip-us.apache.org/repos/asf/camel/blob/d0d12f25/camel-core/src/main/java/org/apache/camel/component/scheduler/springboot/SchedulerComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/scheduler/springboot/SchedulerComponentAutoConfiguration.java b/camel-core/src/main/java/org/apache/camel/component/scheduler/springboot/SchedulerComponentAutoConfiguration.java
index 0c57605..897a713 100644
--- a/camel-core/src/main/java/org/apache/camel/component/scheduler/springboot/SchedulerComponentAutoConfiguration.java
+++ b/camel-core/src/main/java/org/apache/camel/component/scheduler/springboot/SchedulerComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(SchedulerComponentConfiguration.class)
public class SchedulerComponentAutoConfiguration {
- @Bean
+ @Bean(name = "scheduler-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(SchedulerComponent.class)
public SchedulerComponent configureSchedulerComponent(
http://git-wip-us.apache.org/repos/asf/camel/blob/d0d12f25/camel-core/src/main/java/org/apache/camel/component/seda/springboot/SedaComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/seda/springboot/SedaComponentAutoConfiguration.java b/camel-core/src/main/java/org/apache/camel/component/seda/springboot/SedaComponentAutoConfiguration.java
index 5bc1132..8278164 100644
--- a/camel-core/src/main/java/org/apache/camel/component/seda/springboot/SedaComponentAutoConfiguration.java
+++ b/camel-core/src/main/java/org/apache/camel/component/seda/springboot/SedaComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(SedaComponentConfiguration.class)
public class SedaComponentAutoConfiguration {
- @Bean
+ @Bean(name = "seda-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(SedaComponent.class)
public SedaComponent configureSedaComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/d0d12f25/camel-core/src/main/java/org/apache/camel/component/stub/springboot/StubComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/stub/springboot/StubComponentAutoConfiguration.java b/camel-core/src/main/java/org/apache/camel/component/stub/springboot/StubComponentAutoConfiguration.java
index fe22e10..451c9b9 100644
--- a/camel-core/src/main/java/org/apache/camel/component/stub/springboot/StubComponentAutoConfiguration.java
+++ b/camel-core/src/main/java/org/apache/camel/component/stub/springboot/StubComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(StubComponentConfiguration.class)
public class StubComponentAutoConfiguration {
- @Bean
+ @Bean(name = "stub-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(StubComponent.class)
public StubComponent configureStubComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/d0d12f25/camel-core/src/main/java/org/apache/camel/component/validator/springboot/ValidatorComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/validator/springboot/ValidatorComponentAutoConfiguration.java b/camel-core/src/main/java/org/apache/camel/component/validator/springboot/ValidatorComponentAutoConfiguration.java
index b51c71f..1510856 100644
--- a/camel-core/src/main/java/org/apache/camel/component/validator/springboot/ValidatorComponentAutoConfiguration.java
+++ b/camel-core/src/main/java/org/apache/camel/component/validator/springboot/ValidatorComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(ValidatorComponentConfiguration.class)
public class ValidatorComponentAutoConfiguration {
- @Bean
+ @Bean(name = "validator-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(ValidatorComponent.class)
public ValidatorComponent configureValidatorComponent(
http://git-wip-us.apache.org/repos/asf/camel/blob/d0d12f25/camel-core/src/main/java/org/apache/camel/component/vm/springboot/VmComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/vm/springboot/VmComponentAutoConfiguration.java b/camel-core/src/main/java/org/apache/camel/component/vm/springboot/VmComponentAutoConfiguration.java
index 4d07d07..8fb3b6a 100644
--- a/camel-core/src/main/java/org/apache/camel/component/vm/springboot/VmComponentAutoConfiguration.java
+++ b/camel-core/src/main/java/org/apache/camel/component/vm/springboot/VmComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(VmComponentConfiguration.class)
public class VmComponentAutoConfiguration {
- @Bean
+ @Bean(name = "vm-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(VmComponent.class)
public VmComponent configureVmComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/d0d12f25/camel-core/src/main/java/org/apache/camel/component/xslt/springboot/XsltComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/xslt/springboot/XsltComponentAutoConfiguration.java b/camel-core/src/main/java/org/apache/camel/component/xslt/springboot/XsltComponentAutoConfiguration.java
index 8cac574..8b927e5 100644
--- a/camel-core/src/main/java/org/apache/camel/component/xslt/springboot/XsltComponentAutoConfiguration.java
+++ b/camel-core/src/main/java/org/apache/camel/component/xslt/springboot/XsltComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(XsltComponentConfiguration.class)
public class XsltComponentAutoConfiguration {
- @Bean
+ @Bean(name = "xslt-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(XsltComponent.class)
public XsltComponent configureXsltComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/d0d12f25/camel-core/src/main/java/org/apache/camel/impl/springboot/GzipDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/springboot/GzipDataFormatAutoConfiguration.java b/camel-core/src/main/java/org/apache/camel/impl/springboot/GzipDataFormatAutoConfiguration.java
index 90e9cd0..aaff31d 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/springboot/GzipDataFormatAutoConfiguration.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/springboot/GzipDataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(GzipDataFormatConfiguration.class)
public class GzipDataFormatAutoConfiguration {
- @Bean
+ @Bean(name = "gzip-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(GzipDataFormat.class)
public GzipDataFormat configureGzipDataFormat(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/d0d12f25/camel-core/src/main/java/org/apache/camel/impl/springboot/SerializationDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/springboot/SerializationDataFormatAutoConfiguration.java b/camel-core/src/main/java/org/apache/camel/impl/springboot/SerializationDataFormatAutoConfiguration.java
index 7bf60fd..fbcc1a7 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/springboot/SerializationDataFormatAutoConfiguration.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/springboot/SerializationDataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(SerializationDataFormatConfiguration.class)
public class SerializationDataFormatAutoConfiguration {
- @Bean
+ @Bean(name = "serialization-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(SerializationDataFormat.class)
public SerializationDataFormat configureSerializationDataFormat(
http://git-wip-us.apache.org/repos/asf/camel/blob/d0d12f25/camel-core/src/main/java/org/apache/camel/impl/springboot/StringDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/springboot/StringDataFormatAutoConfiguration.java b/camel-core/src/main/java/org/apache/camel/impl/springboot/StringDataFormatAutoConfiguration.java
index a47e939..35daf7b 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/springboot/StringDataFormatAutoConfiguration.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/springboot/StringDataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(StringDataFormatConfiguration.class)
public class StringDataFormatAutoConfiguration {
- @Bean
+ @Bean(name = "string-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(StringDataFormat.class)
public StringDataFormat configureStringDataFormat(
http://git-wip-us.apache.org/repos/asf/camel/blob/d0d12f25/camel-core/src/main/java/org/apache/camel/impl/springboot/ZipDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/springboot/ZipDataFormatAutoConfiguration.java b/camel-core/src/main/java/org/apache/camel/impl/springboot/ZipDataFormatAutoConfiguration.java
index c007de0..bc1170d 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/springboot/ZipDataFormatAutoConfiguration.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/springboot/ZipDataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(ZipDataFormatConfiguration.class)
public class ZipDataFormatAutoConfiguration {
- @Bean
+ @Bean(name = "zip-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(ZipDataFormat.class)
public ZipDataFormat configureZipDataFormat(CamelContext camelContext,
[5/9] camel git commit: Fixed name resolution and added new components
Posted by da...@apache.org.
Fixed name resolution and added new components
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8d5fb02a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8d5fb02a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8d5fb02a
Branch: refs/heads/master
Commit: 8d5fb02af8186831fd43025193a7cc7bec3490cc
Parents: 68ad8ca
Author: Nicola Ferraro <ni...@gmail.com>
Authored: Thu Jul 28 09:59:03 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jul 28 15:24:18 2016 +0200
----------------------------------------------------------------------
.../cxf/jaxrs/springboot/CxfRsComponentAutoConfiguration.java | 2 +-
.../component/cxf/springboot/CxfComponentAutoConfiguration.java | 2 +-
.../disruptor/springboot/DisruptorComponentAutoConfiguration.java | 2 +-
.../vm/springboot/DisruptorVmComponentAutoConfiguration.java | 2 +-
.../jetty9/springboot/JettyHttpComponentAutoConfiguration9.java | 2 +-
.../component/scp/springboot/ScpComponentAutoConfiguration.java | 2 +-
.../xquery/springboot/XQueryComponentAutoConfiguration.java | 2 +-
.../sjms/batch/springboot/SjmsBatchComponentAutoConfiguration.java | 2 +-
.../component/sjms/springboot/SjmsComponentAutoConfiguration.java | 2 +-
.../event/springboot/EventComponentAutoConfiguration.java | 2 +-
.../component/sql/springboot/SqlComponentAutoConfiguration.java | 2 +-
.../sql/stored/springboot/SqlStoredComponentAutoConfiguration.java | 2 +-
.../camel/maven/packaging/SpringBootAutoConfigurationMojo.java | 2 +-
13 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/8d5fb02a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/springboot/CxfRsComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/springboot/CxfRsComponentAutoConfiguration.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/springboot/CxfRsComponentAutoConfiguration.java
index e0ae938..52ada16 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/springboot/CxfRsComponentAutoConfiguration.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/springboot/CxfRsComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(CxfRsComponentConfiguration.class)
public class CxfRsComponentAutoConfiguration {
- @Bean
+ @Bean(name = "cxfrs-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(CxfRsComponent.class)
public CxfRsComponent configureCxfRsComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/8d5fb02a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/springboot/CxfComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/springboot/CxfComponentAutoConfiguration.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/springboot/CxfComponentAutoConfiguration.java
index 7c24123..21f5c1e 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/springboot/CxfComponentAutoConfiguration.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/springboot/CxfComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(CxfComponentConfiguration.class)
public class CxfComponentAutoConfiguration {
- @Bean
+ @Bean(name = "cxf-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(CxfComponent.class)
public CxfComponent configureCxfComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/8d5fb02a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/springboot/DisruptorComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/springboot/DisruptorComponentAutoConfiguration.java b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/springboot/DisruptorComponentAutoConfiguration.java
index dd065ce..03c9496 100644
--- a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/springboot/DisruptorComponentAutoConfiguration.java
+++ b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/springboot/DisruptorComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(DisruptorComponentConfiguration.class)
public class DisruptorComponentAutoConfiguration {
- @Bean
+ @Bean(name = "disruptor-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(DisruptorComponent.class)
public DisruptorComponent configureDisruptorComponent(
http://git-wip-us.apache.org/repos/asf/camel/blob/8d5fb02a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/vm/springboot/DisruptorVmComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/vm/springboot/DisruptorVmComponentAutoConfiguration.java b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/vm/springboot/DisruptorVmComponentAutoConfiguration.java
index 300b9dc..44a630e 100644
--- a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/vm/springboot/DisruptorVmComponentAutoConfiguration.java
+++ b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/vm/springboot/DisruptorVmComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(DisruptorVmComponentConfiguration.class)
public class DisruptorVmComponentAutoConfiguration {
- @Bean
+ @Bean(name = "disruptor-vm-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(DisruptorVmComponent.class)
public DisruptorVmComponent configureDisruptorVmComponent(
http://git-wip-us.apache.org/repos/asf/camel/blob/8d5fb02a/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentAutoConfiguration9.java
----------------------------------------------------------------------
diff --git a/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentAutoConfiguration9.java b/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentAutoConfiguration9.java
index 9718b63..d1f37a8 100644
--- a/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentAutoConfiguration9.java
+++ b/components/camel-jetty9/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentAutoConfiguration9.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(JettyHttpComponentConfiguration9.class)
public class JettyHttpComponentAutoConfiguration9 {
- @Bean
+ @Bean(name = "jetty-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(JettyHttpComponent9.class)
public JettyHttpComponent9 configureJettyHttpComponent9(
http://git-wip-us.apache.org/repos/asf/camel/blob/8d5fb02a/components/camel-jsch/src/main/java/org/apache/camel/component/scp/springboot/ScpComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-jsch/src/main/java/org/apache/camel/component/scp/springboot/ScpComponentAutoConfiguration.java b/components/camel-jsch/src/main/java/org/apache/camel/component/scp/springboot/ScpComponentAutoConfiguration.java
index 20fe2b2..e5c0037 100644
--- a/components/camel-jsch/src/main/java/org/apache/camel/component/scp/springboot/ScpComponentAutoConfiguration.java
+++ b/components/camel-jsch/src/main/java/org/apache/camel/component/scp/springboot/ScpComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(ScpComponentConfiguration.class)
public class ScpComponentAutoConfiguration {
- @Bean
+ @Bean(name = "scp-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(ScpComponent.class)
public ScpComponent configureScpComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/8d5fb02a/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/springboot/XQueryComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/springboot/XQueryComponentAutoConfiguration.java b/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/springboot/XQueryComponentAutoConfiguration.java
index 0acab53..c52467f 100644
--- a/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/springboot/XQueryComponentAutoConfiguration.java
+++ b/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/springboot/XQueryComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(XQueryComponentConfiguration.class)
public class XQueryComponentAutoConfiguration {
- @Bean
+ @Bean(name = "xquery-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(XQueryComponent.class)
public XQueryComponent configureXQueryComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/8d5fb02a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/springboot/SjmsBatchComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/springboot/SjmsBatchComponentAutoConfiguration.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/springboot/SjmsBatchComponentAutoConfiguration.java
index 88d6d4c..e236e8e 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/springboot/SjmsBatchComponentAutoConfiguration.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/springboot/SjmsBatchComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(SjmsBatchComponentConfiguration.class)
public class SjmsBatchComponentAutoConfiguration {
- @Bean
+ @Bean(name = "sjms-batch-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(SjmsBatchComponent.class)
public SjmsBatchComponent configureSjmsBatchComponent(
http://git-wip-us.apache.org/repos/asf/camel/blob/8d5fb02a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/springboot/SjmsComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/springboot/SjmsComponentAutoConfiguration.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/springboot/SjmsComponentAutoConfiguration.java
index 0b3a9ea..5683591 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/springboot/SjmsComponentAutoConfiguration.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/springboot/SjmsComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(SjmsComponentConfiguration.class)
public class SjmsComponentAutoConfiguration {
- @Bean
+ @Bean(name = "sjms-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(SjmsComponent.class)
public SjmsComponent configureSjmsComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/8d5fb02a/components/camel-spring/src/main/java/org/apache/camel/component/event/springboot/EventComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/main/java/org/apache/camel/component/event/springboot/EventComponentAutoConfiguration.java b/components/camel-spring/src/main/java/org/apache/camel/component/event/springboot/EventComponentAutoConfiguration.java
index b0561e1..38e9000 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/component/event/springboot/EventComponentAutoConfiguration.java
+++ b/components/camel-spring/src/main/java/org/apache/camel/component/event/springboot/EventComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(EventComponentConfiguration.class)
public class EventComponentAutoConfiguration {
- @Bean
+ @Bean(name = "spring-event-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(EventComponent.class)
public EventComponent configureEventComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/8d5fb02a/components/camel-sql/src/main/java/org/apache/camel/component/sql/springboot/SqlComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/springboot/SqlComponentAutoConfiguration.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/springboot/SqlComponentAutoConfiguration.java
index 44802fd..85c8dba 100644
--- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/springboot/SqlComponentAutoConfiguration.java
+++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/springboot/SqlComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(SqlComponentConfiguration.class)
public class SqlComponentAutoConfiguration {
- @Bean
+ @Bean(name = "sql-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(SqlComponent.class)
public SqlComponent configureSqlComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/8d5fb02a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/springboot/SqlStoredComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/springboot/SqlStoredComponentAutoConfiguration.java b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/springboot/SqlStoredComponentAutoConfiguration.java
index 05cc45d..2ed59e1 100644
--- a/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/springboot/SqlStoredComponentAutoConfiguration.java
+++ b/components/camel-sql/src/main/java/org/apache/camel/component/sql/stored/springboot/SqlStoredComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(SqlStoredComponentConfiguration.class)
public class SqlStoredComponentAutoConfiguration {
- @Bean
+ @Bean(name = "sql-stored-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(SqlStoredComponent.class)
public SqlStoredComponent configureSqlStoredComponent(
http://git-wip-us.apache.org/repos/asf/camel/blob/8d5fb02a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
index aedcf49..06ccde5 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
@@ -158,7 +158,7 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo {
String pkg = model.getJavaType().substring(0, pos) + ".springboot";
String overrideComponentName = null;
- if(aliases.size()>0) {
+ if(aliases.size()>1) {
// determine component name when there are multiple ones
overrideComponentName = model.getArtifactId().replace("camel-", "");
}
[9/9] camel git commit: Sorting aliases to always get the same result
Posted by da...@apache.org.
Sorting aliases to always get the same result
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/59a71304
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/59a71304
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/59a71304
Branch: refs/heads/master
Commit: 59a713043587d7df5cf9d3f7ae390a027cf2492e
Parents: 6154518
Author: Nicola Ferraro <ni...@gmail.com>
Authored: Thu Jul 28 10:07:11 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jul 28 15:24:18 2016 +0200
----------------------------------------------------------------------
.../cometd/springboot/CometdComponentAutoConfiguration.java | 2 +-
.../mail/springboot/MailComponentAutoConfiguration.java | 4 ++--
.../smpp/springboot/SmppComponentAutoConfiguration.java | 2 +-
.../camel/maven/packaging/SpringBootAutoConfigurationMojo.java | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/59a71304/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentAutoConfiguration.java b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentAutoConfiguration.java
index 4d1a950..004fbd7 100644
--- a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentAutoConfiguration.java
+++ b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(CometdComponentConfiguration.class)
public class CometdComponentAutoConfiguration {
- @Bean(name = {"cometds-component", "cometd-component"})
+ @Bean(name = {"cometd-component", "cometds-component"})
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(CometdComponent.class)
public CometdComponent configureCometdComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/59a71304/components/camel-mail/src/main/java/org/apache/camel/component/mail/springboot/MailComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-mail/src/main/java/org/apache/camel/component/mail/springboot/MailComponentAutoConfiguration.java b/components/camel-mail/src/main/java/org/apache/camel/component/mail/springboot/MailComponentAutoConfiguration.java
index d39dea1..4746a0a 100644
--- a/components/camel-mail/src/main/java/org/apache/camel/component/mail/springboot/MailComponentAutoConfiguration.java
+++ b/components/camel-mail/src/main/java/org/apache/camel/component/mail/springboot/MailComponentAutoConfiguration.java
@@ -34,8 +34,8 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(MailComponentConfiguration.class)
public class MailComponentAutoConfiguration {
- @Bean(name = {"imaps-component", "imap-component", "pop3-component",
- "smtps-component", "pop3s-component", "smtp-component"})
+ @Bean(name = {"imap-component", "imaps-component", "pop3-component",
+ "pop3s-component", "smtp-component", "smtps-component"})
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(MailComponent.class)
public MailComponent configureMailComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/59a71304/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/springboot/SmppComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/springboot/SmppComponentAutoConfiguration.java b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/springboot/SmppComponentAutoConfiguration.java
index d7e47e1..d4b4816 100644
--- a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/springboot/SmppComponentAutoConfiguration.java
+++ b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/springboot/SmppComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(SmppComponentConfiguration.class)
public class SmppComponentAutoConfiguration {
- @Bean(name = {"smpps-component", "smpp-component"})
+ @Bean(name = {"smpp-component", "smpps-component"})
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(SmppComponent.class)
public SmppComponent configureSmppComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/59a71304/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
index 1008d1c..164f870 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
@@ -136,7 +136,7 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo {
for (String componentClass : grModels.keySet()) {
List<ComponentModel> compModels = grModels.get(componentClass);
ComponentModel model = compModels.get(0); // They should be equivalent
- List<String> aliases = compModels.stream().map(m -> m.getScheme()).collect(Collectors.toList());
+ List<String> aliases = compModels.stream().map(m -> m.getScheme()).sorted().collect(Collectors.toList());
// only create source code if the component has options that can be used in auto configuration
if (!model.getComponentOptions().isEmpty()) {
[8/9] camel git commit: Fixed style errors on multiple modules
Posted by da...@apache.org.
Fixed style errors on multiple modules
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bad9fc2c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bad9fc2c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bad9fc2c
Branch: refs/heads/master
Commit: bad9fc2c7ee6fe863453afe298b18e9c6fcc8569
Parents: 3a34d25
Author: Nicola Ferraro <ni...@gmail.com>
Authored: Thu Jul 28 13:23:07 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jul 28 15:24:18 2016 +0200
----------------------------------------------------------------------
.../influxdb/CamelInfluxDbException.java | 4 +-
.../mime/multipart/MimeMultipartDataFormat.java | 5 +-
.../rabbitmq/RabbitMQDeclareSupport.java | 8 +--
.../salesforce/SalesforceConsumer.java | 2 +-
.../client/DefaultAnalyticsApiClient.java | 54 ++++++++++----------
.../internal/client/DefaultRestClient.java | 15 +++---
.../internal/processor/XmlRestProcessor.java | 2 +-
.../apache/camel/maven/CamelSalesforceMojo.java | 2 +-
.../ZipkinConditionalAutoConfiguration.java | 16 ++++++
.../catalog/UnsafeUriCharactersEncoder.java | 2 +-
10 files changed, 63 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/bad9fc2c/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/CamelInfluxDbException.java
----------------------------------------------------------------------
diff --git a/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/CamelInfluxDbException.java b/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/CamelInfluxDbException.java
index ea50714..84352de 100644
--- a/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/CamelInfluxDbException.java
+++ b/components/camel-influxdb/src/main/java/org/apache/camel/component/influxdb/CamelInfluxDbException.java
@@ -18,9 +18,9 @@ package org.apache.camel.component.influxdb;
public class CamelInfluxDbException extends RuntimeException {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
- public CamelInfluxDbException(String message, Throwable cause) {
+ public CamelInfluxDbException(String message, Throwable cause) {
super(message, cause);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/bad9fc2c/components/camel-mail/src/main/java/org/apache/camel/dataformat/mime/multipart/MimeMultipartDataFormat.java
----------------------------------------------------------------------
diff --git a/components/camel-mail/src/main/java/org/apache/camel/dataformat/mime/multipart/MimeMultipartDataFormat.java b/components/camel-mail/src/main/java/org/apache/camel/dataformat/mime/multipart/MimeMultipartDataFormat.java
index 0af87fb..73beac0 100644
--- a/components/camel-mail/src/main/java/org/apache/camel/dataformat/mime/multipart/MimeMultipartDataFormat.java
+++ b/components/camel-mail/src/main/java/org/apache/camel/dataformat/mime/multipart/MimeMultipartDataFormat.java
@@ -27,7 +27,6 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.regex.Pattern;
-
import javax.activation.DataHandler;
import javax.activation.DataSource;
import javax.mail.BodyPart;
@@ -254,7 +253,7 @@ public class MimeMultipartDataFormat implements DataFormat {
Header header = headers.nextElement();
camelAttachment.addHeader(header.getName(), header.getValue());
}
- camelMessage.addAttachmentObject(getAttachmentKey(bp), camelAttachment);
+ camelMessage.addAttachmentObject(getAttachmentKey(bp), camelAttachment);
}
}
if (content instanceof BodyPart) {
@@ -289,7 +288,7 @@ public class MimeMultipartDataFormat implements DataFormat {
String key = bp.getFileName();
// if there is no file name we use the Content-ID header
if (key == null && bp instanceof MimeBodyPart) {
- key = ((MimeBodyPart)bp).getContentID();
+ key = ((MimeBodyPart) bp).getContentID();
if (key != null && key.startsWith("<") && key.length() > 2) {
// strip <>
key = key.substring(1, key.length() - 1);
http://git-wip-us.apache.org/repos/asf/camel/blob/bad9fc2c/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java
index f22592d..5707312 100644
--- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java
+++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java
@@ -82,7 +82,7 @@ public class RabbitMQDeclareSupport {
private boolean shouldDeclareQueue() {
return !endpoint.isSkipQueueDeclare() && endpoint.getQueue() != null;
}
-
+
private boolean shouldDeclareExchange() {
return !endpoint.isSkipExchangeDeclare();
}
@@ -90,13 +90,13 @@ public class RabbitMQDeclareSupport {
private boolean shouldBindQueue() {
return !endpoint.isSkipQueueBind();
}
-
+
private void populateQueueArgumentsFromConfigurer(final Map<String, Object> queueArgs) {
if (endpoint.getQueueArgsConfigurer() != null) {
endpoint.getQueueArgsConfigurer().configurArgs(queueArgs);
}
}
-
+
private void declareExchange(final Channel channel, final String exchange, final String exchangeType, final Map<String, Object> exchangeArgs) throws IOException {
channel.exchangeDeclare(exchange, exchangeType, endpoint.isDurable(), endpoint.isAutoDelete(), exchangeArgs);
}
@@ -104,7 +104,7 @@ public class RabbitMQDeclareSupport {
private void declareAndBindQueue(final Channel channel, final String queue, final String exchange, final String routingKey, final Map<String, Object> arguments)
throws IOException {
channel.queueDeclare(queue, endpoint.isDurable(), false, endpoint.isAutoDelete(), arguments);
- if(shouldBindQueue()){
+ if (shouldBindQueue()) {
channel.queueBind(queue, exchange, emptyIfNull(routingKey));
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/bad9fc2c/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
index be0ed52..83772e6 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
@@ -27,8 +27,8 @@ import org.apache.camel.AsyncCallback;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.component.salesforce.internal.client.DefaultRestClient;
import org.apache.camel.component.salesforce.api.utils.JsonUtils;
+import org.apache.camel.component.salesforce.internal.client.DefaultRestClient;
import org.apache.camel.component.salesforce.internal.client.RestClient;
import org.apache.camel.component.salesforce.internal.streaming.PushTopicHelper;
import org.apache.camel.component.salesforce.internal.streaming.SubscriptionHelper;
http://git-wip-us.apache.org/repos/asf/camel/blob/bad9fc2c/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultAnalyticsApiClient.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultAnalyticsApiClient.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultAnalyticsApiClient.java
index 5d0a860..3461c14 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultAnalyticsApiClient.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultAnalyticsApiClient.java
@@ -26,7 +26,6 @@ import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.camel.component.salesforce.SalesforceHttpClient;
-import org.apache.camel.component.salesforce.api.utils.JsonUtils;
import org.apache.camel.component.salesforce.api.SalesforceException;
import org.apache.camel.component.salesforce.api.dto.RestError;
import org.apache.camel.component.salesforce.api.dto.analytics.reports.AsyncReportResults;
@@ -35,6 +34,7 @@ import org.apache.camel.component.salesforce.api.dto.analytics.reports.ReportDes
import org.apache.camel.component.salesforce.api.dto.analytics.reports.ReportInstance;
import org.apache.camel.component.salesforce.api.dto.analytics.reports.ReportMetadata;
import org.apache.camel.component.salesforce.api.dto.analytics.reports.SyncReportResults;
+import org.apache.camel.component.salesforce.api.utils.JsonUtils;
import org.apache.camel.component.salesforce.internal.SalesforceSession;
import org.eclipse.jetty.client.api.Request;
import org.eclipse.jetty.client.api.Response;
@@ -73,8 +73,8 @@ public class DefaultAnalyticsApiClient extends AbstractClientBase implements Ana
if (response != null) {
try {
recentReports = unmarshalResponse(response, request,
- new TypeReference<List<RecentReport>>() {
- }
+ new TypeReference<List<RecentReport>>() {
+ }
);
} catch (SalesforceException e) {
ex = e;
@@ -110,7 +110,7 @@ public class DefaultAnalyticsApiClient extends AbstractClientBase implements Ana
final boolean useGet = reportMetadata == null;
final Request request = getRequest(
- useGet ? HttpMethod.GET : HttpMethod.POST, reportsUrl(reportId, includeDetails));
+ useGet ? HttpMethod.GET : HttpMethod.POST, reportsUrl(reportId, includeDetails));
// set POST data
if (!useGet) {
@@ -144,7 +144,7 @@ public class DefaultAnalyticsApiClient extends AbstractClientBase implements Ana
final ReportInstanceResponseCallback callback) {
final Request request = getRequest(HttpMethod.POST,
- reportInstancesUrl(reportId, includeDetails));
+ reportInstancesUrl(reportId, includeDetails));
// set POST data
if (reportMetadata != null) {
@@ -186,8 +186,8 @@ public class DefaultAnalyticsApiClient extends AbstractClientBase implements Ana
if (response != null) {
try {
reportInstances = unmarshalResponse(response, request,
- new TypeReference<List<ReportInstance>>() {
- }
+ new TypeReference<List<ReportInstance>>() {
+ }
);
} catch (SalesforceException e) {
ex = e;
@@ -202,7 +202,7 @@ public class DefaultAnalyticsApiClient extends AbstractClientBase implements Ana
public void getReportResults(String reportId, String instanceId, final ReportResultsResponseCallback callback) {
final Request request = getRequest(HttpMethod.GET,
- reportInstancesUrl(reportId, instanceId));
+ reportInstancesUrl(reportId, instanceId));
doHttpRequest(request, new ClientResponseCallback() {
@Override
@@ -228,7 +228,7 @@ public class DefaultAnalyticsApiClient extends AbstractClientBase implements Ana
}
private String reportsUrl(String reportId) {
- return reportsUrl() + "/" + reportId;
+ return reportsUrl() + "/" + reportId;
}
private String reportsUrl(String reportId, Boolean includeDetails) {
@@ -242,7 +242,7 @@ public class DefaultAnalyticsApiClient extends AbstractClientBase implements Ana
private String reportInstancesUrl(String reportId, Boolean includeDetails) {
return includeDetails == null ? reportInstancesUrl(reportId)
- : reportInstancesUrl(reportId) + INCLUDE_DETAILS_QUERY_PARAM + includeDetails;
+ : reportInstancesUrl(reportId) + INCLUDE_DETAILS_QUERY_PARAM + includeDetails;
}
private String reportInstancesUrl(String reportId, String instanceId) {
@@ -262,25 +262,25 @@ public class DefaultAnalyticsApiClient extends AbstractClientBase implements Ana
if (responseContent != null) {
// unmarshal RestError
final List<RestError> errors = objectMapper.readValue(responseContent,
- new TypeReference<List<RestError>>() {
- });
+ new TypeReference<List<RestError>>() {
+ });
return new SalesforceException(errors, statusCode);
}
} catch (UnsupportedEncodingException e) {
// log and ignore
String msg = "Unexpected Error parsing JSON error response body + ["
- + responseContent + "] : " + e.getMessage();
+ + responseContent + "] : " + e.getMessage();
log.warn(msg, e);
} catch (IOException e) {
// log and ignore
String msg = "Unexpected Error parsing JSON error response body + ["
- + responseContent + "] : " + e.getMessage();
+ + responseContent + "] : " + e.getMessage();
log.warn(msg, e);
}
// just report HTTP status info
String message = String.format("Unexpected error: %s, with content: %s",
- response.getReason(), responseContent);
+ response.getReason(), responseContent);
return new SalesforceException(message, statusCode);
}
@@ -303,28 +303,28 @@ public class DefaultAnalyticsApiClient extends AbstractClientBase implements Ana
request.content(new BytesContentProvider(objectMapper.writeValueAsBytes(input)));
} catch (IOException e) {
throw new SalesforceException(
- String.format("Error marshaling request for {%s:%s} : %s",
- request.getMethod(), request.getURI(), e.getMessage()),
- e);
+ String.format("Error marshaling request for {%s:%s} : %s",
+ request.getMethod(), request.getURI(), e.getMessage()),
+ e);
}
}
private <T> T unmarshalResponse(InputStream response, Request request,
- TypeReference<T> responseTypeReference)
- throws SalesforceException {
+ TypeReference<T> responseTypeReference)
+ throws SalesforceException {
try {
return objectMapper.readValue(response, responseTypeReference);
} catch (IOException e) {
throw new SalesforceException(
- String.format("Error unmarshaling response {%s:%s} : %s",
- request.getMethod(), request.getURI(), e.getMessage()),
- e);
+ String.format("Error unmarshaling response {%s:%s} : %s",
+ request.getMethod(), request.getURI(), e.getMessage()),
+ e);
}
}
private <T> T unmarshalResponse(InputStream response, Request request, Class<T> responseClass)
- throws SalesforceException {
+ throws SalesforceException {
if (response == null) {
return null;
@@ -334,9 +334,9 @@ public class DefaultAnalyticsApiClient extends AbstractClientBase implements Ana
return objectMapper.readValue(response, responseClass);
} catch (IOException e) {
throw new SalesforceException(
- String.format("Error unmarshaling response {%s:%s} : %s",
- request.getMethod(), request.getURI(), e.getMessage()),
- e);
+ String.format("Error unmarshaling response {%s:%s} : %s",
+ request.getMethod(), request.getURI(), e.getMessage()),
+ e);
}
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/bad9fc2c/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java
index d71bf30..f39673b 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java
@@ -29,10 +29,10 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.thoughtworks.xstream.XStream;
import org.apache.camel.component.salesforce.SalesforceHttpClient;
-import org.apache.camel.component.salesforce.api.utils.JsonUtils;
import org.apache.camel.component.salesforce.api.SalesforceException;
import org.apache.camel.component.salesforce.api.SalesforceMultipleChoicesException;
import org.apache.camel.component.salesforce.api.dto.RestError;
+import org.apache.camel.component.salesforce.api.utils.JsonUtils;
import org.apache.camel.component.salesforce.internal.PayloadFormat;
import org.apache.camel.component.salesforce.internal.SalesforceSession;
import org.apache.camel.component.salesforce.internal.dto.RestChoices;
@@ -59,7 +59,7 @@ public class DefaultRestClient extends AbstractClientBase implements RestClient
private XStream xStream;
public DefaultRestClient(SalesforceHttpClient httpClient, String version, PayloadFormat format, SalesforceSession session)
- throws SalesforceException {
+ throws SalesforceException {
super(version, session, httpClient);
this.format = format;
@@ -100,7 +100,8 @@ public class DefaultRestClient extends AbstractClientBase implements RestClient
// return list of choices as error message for 300
if (statusCode == HttpStatus.MULTIPLE_CHOICES_300) {
if (PayloadFormat.JSON.equals(format)) {
- choices = objectMapper.readValue(responseContent, new TypeReference<List<String>>() { });
+ choices = objectMapper.readValue(responseContent, new TypeReference<List<String>>() {
+ });
} else {
RestChoices restChoices = new RestChoices();
xStream.fromXML(responseContent, restChoices);
@@ -111,8 +112,8 @@ public class DefaultRestClient extends AbstractClientBase implements RestClient
final List<RestError> restErrors;
if (PayloadFormat.JSON.equals(format)) {
restErrors = objectMapper.readValue(
- responseContent, new TypeReference<List<RestError>>() {
- }
+ responseContent, new TypeReference<List<RestError>>() {
+ }
);
} else {
RestErrors errors = new RestErrors();
@@ -378,7 +379,7 @@ public class DefaultRestClient extends AbstractClientBase implements RestClient
if (requestDto != null) {
request.content(new InputStreamContentProvider(requestDto));
request.header(HttpHeader.CONTENT_TYPE,
- PayloadFormat.JSON.equals(format) ? APPLICATION_JSON_UTF8 : APPLICATION_XML_UTF8);
+ PayloadFormat.JSON.equals(format) ? APPLICATION_JSON_UTF8 : APPLICATION_XML_UTF8);
}
// requires authorization token
@@ -395,7 +396,7 @@ public class DefaultRestClient extends AbstractClientBase implements RestClient
}
private String apexCallUrl(String apexUrl, Map<String, Object> queryParams)
- throws UnsupportedEncodingException, URISyntaxException {
+ throws UnsupportedEncodingException, URISyntaxException {
if (queryParams != null && !queryParams.isEmpty()) {
apexUrl = URISupport.appendParametersToURI(apexUrl, queryParams);
http://git-wip-us.apache.org/repos/asf/camel/blob/bad9fc2c/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/XmlRestProcessor.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/XmlRestProcessor.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/XmlRestProcessor.java
index 2b4c7af..418e2fd 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/XmlRestProcessor.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/XmlRestProcessor.java
@@ -36,7 +36,6 @@ import org.apache.camel.AsyncCallback;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.component.salesforce.SalesforceEndpoint;
-import org.apache.camel.component.salesforce.api.utils.DateTimeConverter;
import org.apache.camel.component.salesforce.api.SalesforceException;
import org.apache.camel.component.salesforce.api.dto.AbstractDTOBase;
import org.apache.camel.component.salesforce.api.dto.CreateSObjectResult;
@@ -46,6 +45,7 @@ import org.apache.camel.component.salesforce.api.dto.SObjectBasicInfo;
import org.apache.camel.component.salesforce.api.dto.SObjectDescription;
import org.apache.camel.component.salesforce.api.dto.SearchResults;
import org.apache.camel.component.salesforce.api.dto.Versions;
+import org.apache.camel.component.salesforce.api.utils.DateTimeConverter;
import org.apache.camel.component.salesforce.internal.client.XStreamUtils;
import org.eclipse.jetty.util.StringUtil;
http://git-wip-us.apache.org/repos/asf/camel/blob/bad9fc2c/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
index 4830286..88e6b92 100644
--- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
+++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
@@ -49,10 +49,10 @@ import org.apache.camel.component.salesforce.api.dto.PickListValue;
import org.apache.camel.component.salesforce.api.dto.SObject;
import org.apache.camel.component.salesforce.api.dto.SObjectDescription;
import org.apache.camel.component.salesforce.api.dto.SObjectField;
+import org.apache.camel.component.salesforce.api.utils.JsonUtils;
import org.apache.camel.component.salesforce.internal.PayloadFormat;
import org.apache.camel.component.salesforce.internal.SalesforceSession;
import org.apache.camel.component.salesforce.internal.client.DefaultRestClient;
-import org.apache.camel.component.salesforce.api.utils.JsonUtils;
import org.apache.camel.component.salesforce.internal.client.RestClient;
import org.apache.camel.component.salesforce.internal.client.SyncResponseCallback;
import org.apache.camel.util.IntrospectionSupport;
http://git-wip-us.apache.org/repos/asf/camel/blob/bad9fc2c/components/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinConditionalAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinConditionalAutoConfiguration.java b/components/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinConditionalAutoConfiguration.java
index 28fd554..3a2f9d3 100644
--- a/components/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinConditionalAutoConfiguration.java
+++ b/components/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinConditionalAutoConfiguration.java
@@ -1,3 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.camel.zipkin.starter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
http://git-wip-us.apache.org/repos/asf/camel/blob/bad9fc2c/platforms/catalog/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java
index 3ba0490..563bac2 100644
--- a/platforms/catalog/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java
+++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java
@@ -32,7 +32,7 @@ public final class UnsafeUriCharactersEncoder {
private static BitSet unsafeCharactersHttp;
private static final char[] HEX_DIGITS = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C',
'D', 'E', 'F', 'a', 'b', 'c', 'd', 'e', 'f'};
- private static Pattern RAW_PATTERN = Pattern.compile("RAW\\([^\\)]+\\)");
+ private static final Pattern RAW_PATTERN = Pattern.compile("RAW\\([^\\)]+\\)");
static {
unsafeCharactersRfc1738 = new BitSet(256);
[2/9] camel git commit: Changed dataformats
Posted by da...@apache.org.
Changed dataformats
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3a34d258
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3a34d258
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3a34d258
Branch: refs/heads/master
Commit: 3a34d2584f0379843be7702351dd8b1ab364e1d6
Parents: 59a7130
Author: Nicola Ferraro <ni...@gmail.com>
Authored: Thu Jul 28 10:37:20 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jul 28 15:24:18 2016 +0200
----------------------------------------------------------------------
.../BindyCsvDataFormatAutoConfiguration.java | 2 +-
...yFixedLengthDataFormatAutoConfiguration.java | 2 +-
...KeyValuePairDataFormatAutoConfiguration.java | 2 +-
.../GsonDataFormatAutoConfiguration.java | 2 +-
.../JacksonDataFormatAutoConfiguration.java | 2 +-
.../JohnzonDataFormatAutoConfiguration.java | 2 +-
.../SnakeYAMLDataFormatAutoConfiguration.java | 2 +-
.../JsonDataFormatAutoConfiguration.java | 2 +-
.../ZipFileDataFormatAutoConfiguration.java | 2 +-
.../SpringBootAutoConfigurationMojo.java | 66 +++++++++++---------
10 files changed, 46 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/3a34d258/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/springboot/BindyCsvDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/springboot/BindyCsvDataFormatAutoConfiguration.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/springboot/BindyCsvDataFormatAutoConfiguration.java
index ea18818..5126a88 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/springboot/BindyCsvDataFormatAutoConfiguration.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/springboot/BindyCsvDataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(BindyCsvDataFormatConfiguration.class)
public class BindyCsvDataFormatAutoConfiguration {
- @Bean(name = "bindy-dataformat")
+ @Bean(name = "bindy-csv-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(BindyCsvDataFormat.class)
public BindyCsvDataFormat configureBindyCsvDataFormat(
http://git-wip-us.apache.org/repos/asf/camel/blob/3a34d258/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/springboot/BindyFixedLengthDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/springboot/BindyFixedLengthDataFormatAutoConfiguration.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/springboot/BindyFixedLengthDataFormatAutoConfiguration.java
index aa52652..b29c731 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/springboot/BindyFixedLengthDataFormatAutoConfiguration.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/springboot/BindyFixedLengthDataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(BindyFixedLengthDataFormatConfiguration.class)
public class BindyFixedLengthDataFormatAutoConfiguration {
- @Bean(name = "bindy-dataformat")
+ @Bean(name = "bindy-fixed-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(BindyFixedLengthDataFormat.class)
public BindyFixedLengthDataFormat configureBindyFixedLengthDataFormat(
http://git-wip-us.apache.org/repos/asf/camel/blob/3a34d258/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/springboot/BindyKeyValuePairDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/springboot/BindyKeyValuePairDataFormatAutoConfiguration.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/springboot/BindyKeyValuePairDataFormatAutoConfiguration.java
index 434eca5..e2a986f 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/springboot/BindyKeyValuePairDataFormatAutoConfiguration.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/springboot/BindyKeyValuePairDataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(BindyKeyValuePairDataFormatConfiguration.class)
public class BindyKeyValuePairDataFormatAutoConfiguration {
- @Bean(name = "bindy-dataformat")
+ @Bean(name = "bindy-kvp-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(BindyKeyValuePairDataFormat.class)
public BindyKeyValuePairDataFormat configureBindyKeyValuePairDataFormat(
http://git-wip-us.apache.org/repos/asf/camel/blob/3a34d258/components/camel-gson/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-gson/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatAutoConfiguration.java b/components/camel-gson/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatAutoConfiguration.java
index 125133e..c3c66df 100644
--- a/components/camel-gson/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatAutoConfiguration.java
+++ b/components/camel-gson/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(GsonDataFormatConfiguration.class)
public class GsonDataFormatAutoConfiguration {
- @Bean(name = "json-dataformat")
+ @Bean(name = "json-gson-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(GsonDataFormat.class)
public GsonDataFormat configureGsonDataFormat(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/3a34d258/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatAutoConfiguration.java b/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatAutoConfiguration.java
index f9dbaf4..279fc73 100644
--- a/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatAutoConfiguration.java
+++ b/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(JacksonDataFormatConfiguration.class)
public class JacksonDataFormatAutoConfiguration {
- @Bean(name = "json-dataformat")
+ @Bean(name = "json-jackson-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(JacksonDataFormat.class)
public JacksonDataFormat configureJacksonDataFormat(
http://git-wip-us.apache.org/repos/asf/camel/blob/3a34d258/components/camel-johnzon/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-johnzon/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatAutoConfiguration.java b/components/camel-johnzon/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatAutoConfiguration.java
index 15b4183..ae1eb60 100644
--- a/components/camel-johnzon/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatAutoConfiguration.java
+++ b/components/camel-johnzon/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(JohnzonDataFormatConfiguration.class)
public class JohnzonDataFormatAutoConfiguration {
- @Bean(name = "json-dataformat")
+ @Bean(name = "json-johnzon-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(JohnzonDataFormat.class)
public JohnzonDataFormat configureJohnzonDataFormat(
http://git-wip-us.apache.org/repos/asf/camel/blob/3a34d258/components/camel-snakeyaml/src/main/java/org/apache/camel/component/snakeyaml/springboot/SnakeYAMLDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-snakeyaml/src/main/java/org/apache/camel/component/snakeyaml/springboot/SnakeYAMLDataFormatAutoConfiguration.java b/components/camel-snakeyaml/src/main/java/org/apache/camel/component/snakeyaml/springboot/SnakeYAMLDataFormatAutoConfiguration.java
index a8df7f7..b51fc19 100644
--- a/components/camel-snakeyaml/src/main/java/org/apache/camel/component/snakeyaml/springboot/SnakeYAMLDataFormatAutoConfiguration.java
+++ b/components/camel-snakeyaml/src/main/java/org/apache/camel/component/snakeyaml/springboot/SnakeYAMLDataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(SnakeYAMLDataFormatConfiguration.class)
public class SnakeYAMLDataFormatAutoConfiguration {
- @Bean(name = "yaml-dataformat")
+ @Bean(name = "yaml-snakeyaml-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(SnakeYAMLDataFormat.class)
public SnakeYAMLDataFormat configureSnakeYAMLDataFormat(
http://git-wip-us.apache.org/repos/asf/camel/blob/3a34d258/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/springboot/JsonDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/springboot/JsonDataFormatAutoConfiguration.java b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/springboot/JsonDataFormatAutoConfiguration.java
index 69c7046..9e52328 100644
--- a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/springboot/JsonDataFormatAutoConfiguration.java
+++ b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/springboot/JsonDataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(JsonDataFormatConfiguration.class)
public class JsonDataFormatAutoConfiguration {
- @Bean(name = "json-dataformat")
+ @Bean(name = "json-xstream-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(JsonDataFormat.class)
public JsonDataFormat configureJsonDataFormat(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/3a34d258/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatAutoConfiguration.java b/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatAutoConfiguration.java
index 8871e47..59ada4e 100644
--- a/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatAutoConfiguration.java
+++ b/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(ZipFileDataFormatConfiguration.class)
public class ZipFileDataFormatAutoConfiguration {
- @Bean(name = "zipFile-dataformat")
+ @Bean(name = "zipfile-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(ZipFileDataFormat.class)
public ZipFileDataFormat configureZipFileDataFormat(
http://git-wip-us.apache.org/repos/asf/camel/blob/3a34d258/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
index 164f870..4a299b7 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
@@ -160,21 +160,6 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo {
}
- /*
- // only create source code if the component has options that can be used in auto configuration
- if (!model.getComponentOptions().isEmpty()) {
-
- // use springboot as sub package name so the code is not in normal
- // package so the Spring Boot JARs can be optional at runtime
- int pos = model.getJavaType().lastIndexOf(".");
- String pkg = model.getJavaType().substring(0, pos) + ".springboot";
-
- createComponentConfigurationSource(pkg, model, overrideComponentName);
- createComponentAutoConfigurationSource(pkg, model, Collections.singletonList(componentName));
- createComponentSpringFactorySource(pkg, model);
- }
- */
-
}
}
@@ -189,25 +174,44 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo {
// create auto configuration for the components
if (!dataFormatNames.isEmpty()) {
getLog().debug("Found " + dataFormatNames.size() + " dataformats");
+
+ List<DataFormatModel> allModels = new LinkedList<>();
for (String dataFormatName : dataFormatNames) {
String json = loadDataFormaatJson(jsonFiles, dataFormatName);
if (json != null) {
DataFormatModel model = generateDataFormatModel(dataFormatName, json);
+ allModels.add(model);
+ }
+ }
+
+ // Group the models by implementing classes
+ Map<String, List<DataFormatModel>> grModels = allModels.stream().collect(Collectors.groupingBy(m -> m.getJavaType()));
+ for (String dataFormatClass : grModels.keySet()) {
+ List<DataFormatModel> dfModels = grModels.get(dataFormatClass);
+ DataFormatModel model = dfModels.get(0); // They should be equivalent
+ List<String> aliases = dfModels.stream().map(m -> m.getName()).sorted().collect(Collectors.toList());
- // only create source code if the component has options that can be used in auto configuration
- if (!model.getDataFormatOptions().isEmpty()) {
+ // only create source code if the data format has options that can be used in auto configuration
+ if (!model.getDataFormatOptions().isEmpty()) {
- // use springboot as sub package name so the code is not in normal
- // package so the Spring Boot JARs can be optional at runtime
- int pos = model.getJavaType().lastIndexOf(".");
- String pkg = model.getJavaType().substring(0, pos) + ".springboot";
+ // use springboot as sub package name so the code is not in normal
+ // package so the Spring Boot JARs can be optional at runtime
+ int pos = model.getJavaType().lastIndexOf(".");
+ String pkg = model.getJavaType().substring(0, pos) + ".springboot";
- createDataFormatConfigurationSource(pkg, model);
- createDataFormatAutoConfigurationSource(pkg, model);
- createDataFormatSpringFactorySource(pkg, model);
+ String overrideDataformatName = null;
+ if (aliases.size() > 1) {
+ // determine component name when there are multiple ones
+ overrideDataformatName = model.getArtifactId().replace("camel-", "");
}
+
+ createDataFormatConfigurationSource(pkg, model, overrideDataformatName);
+ createDataFormatAutoConfigurationSource(pkg, model, aliases);
+ createDataFormatSpringFactorySource(pkg, model);
}
+
}
+
}
}
@@ -292,7 +296,7 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo {
}
}
- private void createDataFormatConfigurationSource(String packageName, DataFormatModel model) throws MojoFailureException {
+ private void createDataFormatConfigurationSource(String packageName, DataFormatModel model, String overrideDataFormatName) throws MojoFailureException {
final JavaClassSource javaClass = Roaster.create(JavaClassSource.class);
int pos = model.getJavaType().lastIndexOf(".");
@@ -306,7 +310,7 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo {
}
javaClass.getJavaDoc().setFullText(doc);
- String prefix = "camel.dataformat." + model.getName();
+ String prefix = "camel.dataformat." + (overrideDataFormatName != null ? overrideDataFormatName : model.getName());
// make sure prefix is in lower case
prefix = prefix.toLowerCase(Locale.US);
javaClass.addAnnotation("org.springframework.boot.context.properties.ConfigurationProperties").setStringValue("prefix", prefix);
@@ -451,7 +455,7 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo {
}
}
- private void createDataFormatAutoConfigurationSource(String packageName, DataFormatModel model) throws MojoFailureException {
+ private void createDataFormatAutoConfigurationSource(String packageName, DataFormatModel model, List<String> dataFormatAliases) throws MojoFailureException {
final JavaClassSource javaClass = Roaster.create(JavaClassSource.class);
int pos = model.getJavaType().lastIndexOf(".");
@@ -490,9 +494,13 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo {
method.addParameter("CamelContext", "camelContext");
method.addParameter(configurationName, "configuration");
+
+ // Determine all the aliases
// adding the '-dataformat' suffix to prevent collision with component names
- method.addAnnotation(Bean.class).setStringValue("name", model.getModelName() + "-dataformat");
- ;
+ String[] springBeanAliases = dataFormatAliases.stream().map(alias -> alias + "-dataformat").toArray(size -> new String[size]);
+
+ method.addAnnotation(Bean.class).setStringArrayValue("name", springBeanAliases);
+
method.addAnnotation(ConditionalOnClass.class).setLiteralValue("value", "CamelContext.class");
method.addAnnotation(ConditionalOnMissingBean.class).setLiteralValue("value", model.getShortJavaType() + ".class");
[4/9] camel git commit: Added name to some components
Posted by da...@apache.org.
Added name to some components
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/68ad8caf
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/68ad8caf
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/68ad8caf
Branch: refs/heads/master
Commit: 68ad8cafd6cdbd660c1b2045d99b7834eb8427fe
Parents: 84e30b4
Author: Nicola Ferraro <ni...@gmail.com>
Authored: Thu Jul 28 09:55:25 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jul 28 15:24:18 2016 +0200
----------------------------------------------------------------------
.../component/ahc/ws/springboot/WsComponentAutoConfiguration.java | 2 +-
.../component/ahc/springboot/AhcComponentAutoConfiguration.java | 2 +-
.../component/amqp/springboot/AMQPComponentAutoConfiguration.java | 2 +-
.../component/apns/springboot/ApnsComponentAutoConfiguration.java | 2 +-
.../websocket/springboot/WebsocketComponentAutoConfiguration.java | 2 +-
.../component/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 +-
.../beanstalk/springboot/BeanstalkComponentAutoConfiguration.java | 2 +-
.../bindy/csv/springboot/BindyCsvDataFormatAutoConfiguration.java | 2 +-
.../springboot/BindyFixedLengthDataFormatAutoConfiguration.java | 2 +-
.../springboot/BindyKeyValuePairDataFormatAutoConfiguration.java | 2 +-
.../boon/springboot/BoonDataFormatAutoConfiguration.java | 2 +-
.../component/box/springboot/BoxComponentAutoConfiguration.java | 2 +-
.../braintree/springboot/BraintreeComponentAutoConfiguration.java | 2 +-
.../cache/springboot/CacheComponentAutoConfiguration.java | 2 +-
.../castor/springboot/CastorDataFormatAutoConfiguration.java | 2 +-
.../cometd/springboot/CometdComponentAutoConfiguration.java | 2 +-
.../springboot/DigitalSignatureComponentAutoConfiguration.java | 2 +-
.../crypto/springboot/CryptoDataFormatAutoConfiguration.java | 2 +-
.../crypto/springboot/PGPDataFormatAutoConfiguration.java | 2 +-
.../dataformat/csv/springboot/CsvDataFormatAutoConfiguration.java | 2 +-
.../docker/springboot/DockerComponentAutoConfiguration.java | 2 +-
.../component/ejb/springboot/EjbComponentAutoConfiguration.java | 2 +-
.../springboot/ElasticsearchComponentAutoConfiguration.java | 2 +-
.../elsql/springboot/ElsqlComponentAutoConfiguration.java | 2 +-
.../springboot/EventAdminComponentAutoConfiguration.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 +-
.../gson/springboot/GsonDataFormatAutoConfiguration.java | 2 +-
.../springboot/GuavaEventBusComponentAutoConfiguration.java | 2 +-
.../hazelcast/springboot/HazelcastComponentAutoConfiguration.java | 2 +-
.../hbase/springboot/HBaseComponentAutoConfiguration.java | 2 +-
.../component/hdfs/springboot/HdfsComponentAutoConfiguration.java | 2 +-
.../hdfs2/springboot/HdfsComponentAutoConfiguration.java | 2 +-
.../hessian/springboot/HessianDataFormatAutoConfiguration.java | 2 +-
.../component/hl7/springboot/HL7DataFormatAutoConfiguration.java | 2 +-
.../component/http/springboot/HttpComponentAutoConfiguration.java | 2 +-
.../http4/springboot/HttpComponentAutoConfiguration.java | 2 +-
.../ibatis/springboot/IBatisComponentAutoConfiguration.java | 2 +-
.../ical/springboot/ICalDataFormatAutoConfiguration.java | 2 +-
.../jackson/springboot/JacksonDataFormatAutoConfiguration.java | 2 +-
.../springboot/JacksonXMLDataFormatAutoConfiguration.java | 2 +-
.../jaxb/springboot/JaxbDataFormatAutoConfiguration.java | 2 +-
.../jclouds/springboot/JcloudsComponentAutoConfiguration.java | 2 +-
.../component/jdbc/springboot/JdbcComponentAutoConfiguration.java | 2 +-
.../jgroups/springboot/JGroupsComponentAutoConfiguration.java | 2 +-
.../jibx/springboot/JibxDataFormatAutoConfiguration.java | 2 +-
.../component/jms/springboot/JmsComponentAutoConfiguration.java | 2 +-
.../johnzon/springboot/JohnzonDataFormatAutoConfiguration.java | 2 +-
.../component/jolt/springboot/JoltComponentAutoConfiguration.java | 2 +-
.../component/jpa/springboot/JpaComponentAutoConfiguration.java | 2 +-
.../jt400/springboot/Jt400ComponentAutoConfiguration.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 +-
.../dataformat/lzf/springboot/LZFDataFormatAutoConfiguration.java | 2 +-
.../component/mail/springboot/MailComponentAutoConfiguration.java | 3 ++-
.../springboot/MimeMultipartDataFormatAutoConfiguration.java | 2 +-
.../metrics/springboot/MetricsComponentAutoConfiguration.java | 2 +-
.../component/mina/springboot/MinaComponentAutoConfiguration.java | 2 +-
.../mina2/springboot/Mina2ComponentAutoConfiguration.java | 2 +-
.../component/mqtt/springboot/MQTTComponentAutoConfiguration.java | 2 +-
.../validator/msv/springboot/MsvComponentAutoConfiguration.java | 2 +-
.../mustache/springboot/MustacheComponentAutoConfiguration.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 +-
.../olingo2/springboot/Olingo2ComponentAutoConfiguration.java | 2 +-
.../openshift/springboot/OpenShiftComponentAutoConfiguration.java | 2 +-
.../component/paho/springboot/PahoComponentAutoConfiguration.java | 2 +-
.../springboot/PaxLoggingComponentAutoConfiguration.java | 2 +-
.../protobuf/springboot/ProtobufDataFormatAutoConfiguration.java | 2 +-
.../quartz/springboot/QuartzComponentAutoConfiguration.java | 2 +-
.../quartz2/springboot/QuartzComponentAutoConfiguration.java | 2 +-
.../quickfixj/springboot/QuickfixjComponentAutoConfiguration.java | 2 +-
.../restlet/springboot/RestletComponentAutoConfiguration.java | 2 +-
.../dataformat/rss/springboot/RssDataFormatAutoConfiguration.java | 2 +-
.../springboot/SalesforceComponentAutoConfiguration.java | 2 +-
.../servlet/springboot/ServletComponentAutoConfiguration.java | 2 +-
.../slack/springboot/SlackComponentAutoConfiguration.java | 2 +-
.../component/smpp/springboot/SmppComponentAutoConfiguration.java | 2 +-
.../springboot/SnakeYAMLDataFormatAutoConfiguration.java | 2 +-
.../soap/springboot/SoapJaxbDataFormatAutoConfiguration.java | 2 +-
.../sparkrest/springboot/SparkComponentAutoConfiguration.java | 2 +-
.../spark/springboot/SparkComponentAutoConfiguration.java | 2 +-
.../splunk/springboot/SplunkComponentAutoConfiguration.java | 2 +-
.../batch/springboot/SpringBatchComponentAutoConfiguration.java | 2 +-
.../component/ssh/springboot/SshComponentAutoConfiguration.java | 2 +-
.../stomp/springboot/StompComponentAutoConfiguration.java | 2 +-
.../syslog/springboot/SyslogDataFormatAutoConfiguration.java | 2 +-
.../tagsoup/springboot/TidyMarkupDataFormatAutoConfiguration.java | 2 +-
.../tarfile/springboot/TarFileDataFormatAutoConfiguration.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 +-
.../websocket/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 +-
.../zookeeper/springboot/ZooKeeperComponentAutoConfiguration.java | 2 +-
124 files changed, 125 insertions(+), 124 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/springboot/WsComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/springboot/WsComponentAutoConfiguration.java b/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/springboot/WsComponentAutoConfiguration.java
index 6139670..6617cb3 100644
--- a/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/springboot/WsComponentAutoConfiguration.java
+++ b/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/springboot/WsComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(WsComponentConfiguration.class)
public class WsComponentAutoConfiguration {
- @Bean
+ @Bean(name = "ahc-ws-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(WsComponent.class)
public WsComponent configureWsComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/springboot/AhcComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/springboot/AhcComponentAutoConfiguration.java b/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/springboot/AhcComponentAutoConfiguration.java
index ace5f3f..5eeb73e 100644
--- a/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/springboot/AhcComponentAutoConfiguration.java
+++ b/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/springboot/AhcComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(AhcComponentConfiguration.class)
public class AhcComponentAutoConfiguration {
- @Bean
+ @Bean(name = "ahc-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(AhcComponent.class)
public AhcComponent configureAhcComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/springboot/AMQPComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/springboot/AMQPComponentAutoConfiguration.java b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/springboot/AMQPComponentAutoConfiguration.java
index 93cf1a2..64a8d44 100644
--- a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/springboot/AMQPComponentAutoConfiguration.java
+++ b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/springboot/AMQPComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(AMQPComponentConfiguration.class)
public class AMQPComponentAutoConfiguration {
- @Bean
+ @Bean(name = "amqp-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(AMQPComponent.class)
public AMQPComponent configureAMQPComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-apns/src/main/java/org/apache/camel/component/apns/springboot/ApnsComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-apns/src/main/java/org/apache/camel/component/apns/springboot/ApnsComponentAutoConfiguration.java b/components/camel-apns/src/main/java/org/apache/camel/component/apns/springboot/ApnsComponentAutoConfiguration.java
index dcc66db..9252104 100644
--- a/components/camel-apns/src/main/java/org/apache/camel/component/apns/springboot/ApnsComponentAutoConfiguration.java
+++ b/components/camel-apns/src/main/java/org/apache/camel/component/apns/springboot/ApnsComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(ApnsComponentConfiguration.class)
public class ApnsComponentAutoConfiguration {
- @Bean
+ @Bean(name = "apns-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(ApnsComponent.class)
public ApnsComponent configureApnsComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentAutoConfiguration.java b/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentAutoConfiguration.java
index 8a46ed0..d1144ad 100644
--- a/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentAutoConfiguration.java
+++ b/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(WebsocketComponentConfiguration.class)
public class WebsocketComponentAutoConfiguration {
- @Bean
+ @Bean(name = "atmosphere-websocket-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(WebsocketComponent.class)
public WebsocketComponent configureWebsocketComponent(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-avro/src/main/java/org/apache/camel/component/avro/springboot/AvroComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-avro/src/main/java/org/apache/camel/component/avro/springboot/AvroComponentAutoConfiguration.java b/components/camel-avro/src/main/java/org/apache/camel/component/avro/springboot/AvroComponentAutoConfiguration.java
index 5002ea5..7e6cc52 100644
--- a/components/camel-avro/src/main/java/org/apache/camel/component/avro/springboot/AvroComponentAutoConfiguration.java
+++ b/components/camel-avro/src/main/java/org/apache/camel/component/avro/springboot/AvroComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(AvroComponentConfiguration.class)
public class AvroComponentAutoConfiguration {
- @Bean
+ @Bean(name = "avro-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(AvroComponent.class)
public AvroComponent configureAvroComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-avro/src/main/java/org/apache/camel/dataformat/avro/springboot/AvroDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-avro/src/main/java/org/apache/camel/dataformat/avro/springboot/AvroDataFormatAutoConfiguration.java b/components/camel-avro/src/main/java/org/apache/camel/dataformat/avro/springboot/AvroDataFormatAutoConfiguration.java
index 97a15f9..9d744ea 100644
--- a/components/camel-avro/src/main/java/org/apache/camel/dataformat/avro/springboot/AvroDataFormatAutoConfiguration.java
+++ b/components/camel-avro/src/main/java/org/apache/camel/dataformat/avro/springboot/AvroDataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(AvroDataFormatConfiguration.class)
public class AvroDataFormatAutoConfiguration {
- @Bean
+ @Bean(name = "avro-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(AvroDataFormat.class)
public AvroDataFormat configureAvroDataFormat(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-barcode/src/main/java/org/apache/camel/dataformat/barcode/springboot/BarcodeDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-barcode/src/main/java/org/apache/camel/dataformat/barcode/springboot/BarcodeDataFormatAutoConfiguration.java b/components/camel-barcode/src/main/java/org/apache/camel/dataformat/barcode/springboot/BarcodeDataFormatAutoConfiguration.java
index 4c63075..c865566 100644
--- a/components/camel-barcode/src/main/java/org/apache/camel/dataformat/barcode/springboot/BarcodeDataFormatAutoConfiguration.java
+++ b/components/camel-barcode/src/main/java/org/apache/camel/dataformat/barcode/springboot/BarcodeDataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(BarcodeDataFormatConfiguration.class)
public class BarcodeDataFormatAutoConfiguration {
- @Bean
+ @Bean(name = "barcode-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(BarcodeDataFormat.class)
public BarcodeDataFormat configureBarcodeDataFormat(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-base64/src/main/java/org/apache/camel/dataformat/base64/springboot/Base64DataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-base64/src/main/java/org/apache/camel/dataformat/base64/springboot/Base64DataFormatAutoConfiguration.java b/components/camel-base64/src/main/java/org/apache/camel/dataformat/base64/springboot/Base64DataFormatAutoConfiguration.java
index c5cce32..204efb2 100644
--- a/components/camel-base64/src/main/java/org/apache/camel/dataformat/base64/springboot/Base64DataFormatAutoConfiguration.java
+++ b/components/camel-base64/src/main/java/org/apache/camel/dataformat/base64/springboot/Base64DataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(Base64DataFormatConfiguration.class)
public class Base64DataFormatAutoConfiguration {
- @Bean
+ @Bean(name = "base64-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(Base64DataFormat.class)
public Base64DataFormat configureBase64DataFormat(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-beanio/src/main/java/org/apache/camel/dataformat/beanio/springboot/BeanIODataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-beanio/src/main/java/org/apache/camel/dataformat/beanio/springboot/BeanIODataFormatAutoConfiguration.java b/components/camel-beanio/src/main/java/org/apache/camel/dataformat/beanio/springboot/BeanIODataFormatAutoConfiguration.java
index 105bedd..00121a8 100644
--- a/components/camel-beanio/src/main/java/org/apache/camel/dataformat/beanio/springboot/BeanIODataFormatAutoConfiguration.java
+++ b/components/camel-beanio/src/main/java/org/apache/camel/dataformat/beanio/springboot/BeanIODataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(BeanIODataFormatConfiguration.class)
public class BeanIODataFormatAutoConfiguration {
- @Bean
+ @Bean(name = "beanio-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(BeanIODataFormat.class)
public BeanIODataFormat configureBeanIODataFormat(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/springboot/BeanstalkComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/springboot/BeanstalkComponentAutoConfiguration.java b/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/springboot/BeanstalkComponentAutoConfiguration.java
index 862d992..d8007c3 100644
--- a/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/springboot/BeanstalkComponentAutoConfiguration.java
+++ b/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/springboot/BeanstalkComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(BeanstalkComponentConfiguration.class)
public class BeanstalkComponentAutoConfiguration {
- @Bean
+ @Bean(name = "beanstalk-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(BeanstalkComponent.class)
public BeanstalkComponent configureBeanstalkComponent(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/springboot/BindyCsvDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/springboot/BindyCsvDataFormatAutoConfiguration.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/springboot/BindyCsvDataFormatAutoConfiguration.java
index 68d13ae..ea18818 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/springboot/BindyCsvDataFormatAutoConfiguration.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/springboot/BindyCsvDataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(BindyCsvDataFormatConfiguration.class)
public class BindyCsvDataFormatAutoConfiguration {
- @Bean
+ @Bean(name = "bindy-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(BindyCsvDataFormat.class)
public BindyCsvDataFormat configureBindyCsvDataFormat(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/springboot/BindyFixedLengthDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/springboot/BindyFixedLengthDataFormatAutoConfiguration.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/springboot/BindyFixedLengthDataFormatAutoConfiguration.java
index 1fbb5df..aa52652 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/springboot/BindyFixedLengthDataFormatAutoConfiguration.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/springboot/BindyFixedLengthDataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(BindyFixedLengthDataFormatConfiguration.class)
public class BindyFixedLengthDataFormatAutoConfiguration {
- @Bean
+ @Bean(name = "bindy-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(BindyFixedLengthDataFormat.class)
public BindyFixedLengthDataFormat configureBindyFixedLengthDataFormat(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/springboot/BindyKeyValuePairDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/springboot/BindyKeyValuePairDataFormatAutoConfiguration.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/springboot/BindyKeyValuePairDataFormatAutoConfiguration.java
index 6601ad2..434eca5 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/springboot/BindyKeyValuePairDataFormatAutoConfiguration.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/springboot/BindyKeyValuePairDataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(BindyKeyValuePairDataFormatConfiguration.class)
public class BindyKeyValuePairDataFormatAutoConfiguration {
- @Bean
+ @Bean(name = "bindy-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(BindyKeyValuePairDataFormat.class)
public BindyKeyValuePairDataFormat configureBindyKeyValuePairDataFormat(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-boon/src/main/java/org/apache/camel/component/boon/springboot/BoonDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-boon/src/main/java/org/apache/camel/component/boon/springboot/BoonDataFormatAutoConfiguration.java b/components/camel-boon/src/main/java/org/apache/camel/component/boon/springboot/BoonDataFormatAutoConfiguration.java
index 22fff8b..36afa5b 100644
--- a/components/camel-boon/src/main/java/org/apache/camel/component/boon/springboot/BoonDataFormatAutoConfiguration.java
+++ b/components/camel-boon/src/main/java/org/apache/camel/component/boon/springboot/BoonDataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(BoonDataFormatConfiguration.class)
public class BoonDataFormatAutoConfiguration {
- @Bean
+ @Bean(name = "boon-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(BoonDataFormat.class)
public BoonDataFormat configureBoonDataFormat(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-box/src/main/java/org/apache/camel/component/box/springboot/BoxComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-box/src/main/java/org/apache/camel/component/box/springboot/BoxComponentAutoConfiguration.java b/components/camel-box/src/main/java/org/apache/camel/component/box/springboot/BoxComponentAutoConfiguration.java
index c0ddc40..d738c9e 100644
--- a/components/camel-box/src/main/java/org/apache/camel/component/box/springboot/BoxComponentAutoConfiguration.java
+++ b/components/camel-box/src/main/java/org/apache/camel/component/box/springboot/BoxComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(BoxComponentConfiguration.class)
public class BoxComponentAutoConfiguration {
- @Bean
+ @Bean(name = "box-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(BoxComponent.class)
public BoxComponent configureBoxComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-braintree/src/main/java/org/apache/camel/component/braintree/springboot/BraintreeComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-braintree/src/main/java/org/apache/camel/component/braintree/springboot/BraintreeComponentAutoConfiguration.java b/components/camel-braintree/src/main/java/org/apache/camel/component/braintree/springboot/BraintreeComponentAutoConfiguration.java
index c6d65ad..0d10ffa 100644
--- a/components/camel-braintree/src/main/java/org/apache/camel/component/braintree/springboot/BraintreeComponentAutoConfiguration.java
+++ b/components/camel-braintree/src/main/java/org/apache/camel/component/braintree/springboot/BraintreeComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(BraintreeComponentConfiguration.class)
public class BraintreeComponentAutoConfiguration {
- @Bean
+ @Bean(name = "braintree-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(BraintreeComponent.class)
public BraintreeComponent configureBraintreeComponent(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-cache/src/main/java/org/apache/camel/component/cache/springboot/CacheComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-cache/src/main/java/org/apache/camel/component/cache/springboot/CacheComponentAutoConfiguration.java b/components/camel-cache/src/main/java/org/apache/camel/component/cache/springboot/CacheComponentAutoConfiguration.java
index 07630b5..822c3f9 100644
--- a/components/camel-cache/src/main/java/org/apache/camel/component/cache/springboot/CacheComponentAutoConfiguration.java
+++ b/components/camel-cache/src/main/java/org/apache/camel/component/cache/springboot/CacheComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(CacheComponentConfiguration.class)
public class CacheComponentAutoConfiguration {
- @Bean
+ @Bean(name = "cache-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(CacheComponent.class)
public CacheComponent configureCacheComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-castor/src/main/java/org/apache/camel/dataformat/castor/springboot/CastorDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-castor/src/main/java/org/apache/camel/dataformat/castor/springboot/CastorDataFormatAutoConfiguration.java b/components/camel-castor/src/main/java/org/apache/camel/dataformat/castor/springboot/CastorDataFormatAutoConfiguration.java
index d54eaaf..f7bb885 100644
--- a/components/camel-castor/src/main/java/org/apache/camel/dataformat/castor/springboot/CastorDataFormatAutoConfiguration.java
+++ b/components/camel-castor/src/main/java/org/apache/camel/dataformat/castor/springboot/CastorDataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(CastorDataFormatConfiguration.class)
public class CastorDataFormatAutoConfiguration {
- @Bean
+ @Bean(name = "castor-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(CastorDataFormat.class)
public CastorDataFormat configureCastorDataFormat(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentAutoConfiguration.java b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentAutoConfiguration.java
index ed11ce3..2e58368 100644
--- a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentAutoConfiguration.java
+++ b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(CometdComponentConfiguration.class)
public class CometdComponentAutoConfiguration {
- @Bean
+ @Bean(name = "cometd-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(CometdComponent.class)
public CometdComponent configureCometdComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/springboot/DigitalSignatureComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/springboot/DigitalSignatureComponentAutoConfiguration.java b/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/springboot/DigitalSignatureComponentAutoConfiguration.java
index 9b96fcd..dafa6fa 100644
--- a/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/springboot/DigitalSignatureComponentAutoConfiguration.java
+++ b/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/springboot/DigitalSignatureComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(DigitalSignatureComponentConfiguration.class)
public class DigitalSignatureComponentAutoConfiguration {
- @Bean
+ @Bean(name = "crypto-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(DigitalSignatureComponent.class)
public DigitalSignatureComponent configureDigitalSignatureComponent(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/springboot/CryptoDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/springboot/CryptoDataFormatAutoConfiguration.java b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/springboot/CryptoDataFormatAutoConfiguration.java
index 2ca8d7d..cef5506 100644
--- a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/springboot/CryptoDataFormatAutoConfiguration.java
+++ b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/springboot/CryptoDataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(CryptoDataFormatConfiguration.class)
public class CryptoDataFormatAutoConfiguration {
- @Bean
+ @Bean(name = "crypto-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(CryptoDataFormat.class)
public CryptoDataFormat configureCryptoDataFormat(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/springboot/PGPDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/springboot/PGPDataFormatAutoConfiguration.java b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/springboot/PGPDataFormatAutoConfiguration.java
index 49d35ba..49186eb 100644
--- a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/springboot/PGPDataFormatAutoConfiguration.java
+++ b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/springboot/PGPDataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(PGPDataFormatConfiguration.class)
public class PGPDataFormatAutoConfiguration {
- @Bean
+ @Bean(name = "pgp-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(PGPDataFormat.class)
public PGPDataFormat configurePGPDataFormat(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/springboot/CsvDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/springboot/CsvDataFormatAutoConfiguration.java b/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/springboot/CsvDataFormatAutoConfiguration.java
index 40a778a..7f3ad94 100644
--- a/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/springboot/CsvDataFormatAutoConfiguration.java
+++ b/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/springboot/CsvDataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(CsvDataFormatConfiguration.class)
public class CsvDataFormatAutoConfiguration {
- @Bean
+ @Bean(name = "csv-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(CsvDataFormat.class)
public CsvDataFormat configureCsvDataFormat(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-docker/src/main/java/org/apache/camel/component/docker/springboot/DockerComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-docker/src/main/java/org/apache/camel/component/docker/springboot/DockerComponentAutoConfiguration.java b/components/camel-docker/src/main/java/org/apache/camel/component/docker/springboot/DockerComponentAutoConfiguration.java
index cf29b2d..e38632b 100644
--- a/components/camel-docker/src/main/java/org/apache/camel/component/docker/springboot/DockerComponentAutoConfiguration.java
+++ b/components/camel-docker/src/main/java/org/apache/camel/component/docker/springboot/DockerComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(DockerComponentConfiguration.class)
public class DockerComponentAutoConfiguration {
- @Bean
+ @Bean(name = "docker-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(DockerComponent.class)
public DockerComponent configureDockerComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-ejb/src/main/java/org/apache/camel/component/ejb/springboot/EjbComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-ejb/src/main/java/org/apache/camel/component/ejb/springboot/EjbComponentAutoConfiguration.java b/components/camel-ejb/src/main/java/org/apache/camel/component/ejb/springboot/EjbComponentAutoConfiguration.java
index 5743f48..24ddc95 100644
--- a/components/camel-ejb/src/main/java/org/apache/camel/component/ejb/springboot/EjbComponentAutoConfiguration.java
+++ b/components/camel-ejb/src/main/java/org/apache/camel/component/ejb/springboot/EjbComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(EjbComponentConfiguration.class)
public class EjbComponentAutoConfiguration {
- @Bean
+ @Bean(name = "ejb-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(EjbComponent.class)
public EjbComponent configureEjbComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/springboot/ElasticsearchComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/springboot/ElasticsearchComponentAutoConfiguration.java b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/springboot/ElasticsearchComponentAutoConfiguration.java
index 3888147..3688285 100644
--- a/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/springboot/ElasticsearchComponentAutoConfiguration.java
+++ b/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/springboot/ElasticsearchComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(ElasticsearchComponentConfiguration.class)
public class ElasticsearchComponentAutoConfiguration {
- @Bean
+ @Bean(name = "elasticsearch-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(ElasticsearchComponent.class)
public ElasticsearchComponent configureElasticsearchComponent(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/springboot/ElsqlComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/springboot/ElsqlComponentAutoConfiguration.java b/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/springboot/ElsqlComponentAutoConfiguration.java
index 6ff272c..bccf07f 100644
--- a/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/springboot/ElsqlComponentAutoConfiguration.java
+++ b/components/camel-elsql/src/main/java/org/apache/camel/component/elsql/springboot/ElsqlComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(ElsqlComponentConfiguration.class)
public class ElsqlComponentAutoConfiguration {
- @Bean
+ @Bean(name = "elsql-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(ElsqlComponent.class)
public ElsqlComponent configureElsqlComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/springboot/EventAdminComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/springboot/EventAdminComponentAutoConfiguration.java b/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/springboot/EventAdminComponentAutoConfiguration.java
index 7e3b3dd..bc35252 100644
--- a/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/springboot/EventAdminComponentAutoConfiguration.java
+++ b/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/springboot/EventAdminComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(EventAdminComponentConfiguration.class)
public class EventAdminComponentAutoConfiguration {
- @Bean
+ @Bean(name = "eventadmin-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(EventAdminComponent.class)
public EventAdminComponent configureEventAdminComponent(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/springboot/FacebookComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/springboot/FacebookComponentAutoConfiguration.java b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/springboot/FacebookComponentAutoConfiguration.java
index 3ad2cc5..989a2bc 100644
--- a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/springboot/FacebookComponentAutoConfiguration.java
+++ b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/springboot/FacebookComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(FacebookComponentConfiguration.class)
public class FacebookComponentAutoConfiguration {
- @Bean
+ @Bean(name = "facebook-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(FacebookComponent.class)
public FacebookComponent configureFacebookComponent(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-flatpack/src/main/java/org/apache/camel/dataformat/flatpack/springboot/FlatpackDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-flatpack/src/main/java/org/apache/camel/dataformat/flatpack/springboot/FlatpackDataFormatAutoConfiguration.java b/components/camel-flatpack/src/main/java/org/apache/camel/dataformat/flatpack/springboot/FlatpackDataFormatAutoConfiguration.java
index f49421c..ed63e2f 100644
--- a/components/camel-flatpack/src/main/java/org/apache/camel/dataformat/flatpack/springboot/FlatpackDataFormatAutoConfiguration.java
+++ b/components/camel-flatpack/src/main/java/org/apache/camel/dataformat/flatpack/springboot/FlatpackDataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(FlatpackDataFormatConfiguration.class)
public class FlatpackDataFormatAutoConfiguration {
- @Bean
+ @Bean(name = "flatpack-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(FlatpackDataFormat.class)
public FlatpackDataFormat configureFlatpackDataFormat(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-flink/src/main/java/org/apache/camel/component/flink/springboot/FlinkComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-flink/src/main/java/org/apache/camel/component/flink/springboot/FlinkComponentAutoConfiguration.java b/components/camel-flink/src/main/java/org/apache/camel/component/flink/springboot/FlinkComponentAutoConfiguration.java
index 3052d49..d1470be 100644
--- a/components/camel-flink/src/main/java/org/apache/camel/component/flink/springboot/FlinkComponentAutoConfiguration.java
+++ b/components/camel-flink/src/main/java/org/apache/camel/component/flink/springboot/FlinkComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(FlinkComponentConfiguration.class)
public class FlinkComponentAutoConfiguration {
- @Bean
+ @Bean(name = "flink-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(FlinkComponent.class)
public FlinkComponent configureFlinkComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/springboot/FreemarkerComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/springboot/FreemarkerComponentAutoConfiguration.java b/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/springboot/FreemarkerComponentAutoConfiguration.java
index e849ff5..d7f98b3 100644
--- a/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/springboot/FreemarkerComponentAutoConfiguration.java
+++ b/components/camel-freemarker/src/main/java/org/apache/camel/component/freemarker/springboot/FreemarkerComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(FreemarkerComponentConfiguration.class)
public class FreemarkerComponentAutoConfiguration {
- @Bean
+ @Bean(name = "freemarker-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(FreemarkerComponent.class)
public FreemarkerComponent configureFreemarkerComponent(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/springboot/GangliaComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/springboot/GangliaComponentAutoConfiguration.java b/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/springboot/GangliaComponentAutoConfiguration.java
index f6118d0..0bf0507 100644
--- a/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/springboot/GangliaComponentAutoConfiguration.java
+++ b/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/springboot/GangliaComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(GangliaComponentConfiguration.class)
public class GangliaComponentAutoConfiguration {
- @Bean
+ @Bean(name = "ganglia-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(GangliaComponent.class)
public GangliaComponent configureGangliaComponent(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/springboot/GoogleCalendarComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/springboot/GoogleCalendarComponentAutoConfiguration.java b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/springboot/GoogleCalendarComponentAutoConfiguration.java
index f13c157..093c87f 100644
--- a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/springboot/GoogleCalendarComponentAutoConfiguration.java
+++ b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/springboot/GoogleCalendarComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(GoogleCalendarComponentConfiguration.class)
public class GoogleCalendarComponentAutoConfiguration {
- @Bean
+ @Bean(name = "google-calendar-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(GoogleCalendarComponent.class)
public GoogleCalendarComponent configureGoogleCalendarComponent(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/springboot/GoogleDriveComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/springboot/GoogleDriveComponentAutoConfiguration.java b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/springboot/GoogleDriveComponentAutoConfiguration.java
index c345e04..d42c3c4 100644
--- a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/springboot/GoogleDriveComponentAutoConfiguration.java
+++ b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/springboot/GoogleDriveComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(GoogleDriveComponentConfiguration.class)
public class GoogleDriveComponentAutoConfiguration {
- @Bean
+ @Bean(name = "google-drive-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(GoogleDriveComponent.class)
public GoogleDriveComponent configureGoogleDriveComponent(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/springboot/GoogleMailComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/springboot/GoogleMailComponentAutoConfiguration.java b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/springboot/GoogleMailComponentAutoConfiguration.java
index 364650a..ef72fd8 100644
--- a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/springboot/GoogleMailComponentAutoConfiguration.java
+++ b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/springboot/GoogleMailComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(GoogleMailComponentConfiguration.class)
public class GoogleMailComponentAutoConfiguration {
- @Bean
+ @Bean(name = "google-mail-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(GoogleMailComponent.class)
public GoogleMailComponent configureGoogleMailComponent(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-gson/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-gson/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatAutoConfiguration.java b/components/camel-gson/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatAutoConfiguration.java
index cc2d707..125133e 100644
--- a/components/camel-gson/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatAutoConfiguration.java
+++ b/components/camel-gson/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(GsonDataFormatConfiguration.class)
public class GsonDataFormatAutoConfiguration {
- @Bean
+ @Bean(name = "json-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(GsonDataFormat.class)
public GsonDataFormat configureGsonDataFormat(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-guava-eventbus/src/main/java/org/apache/camel/component/guava/eventbus/springboot/GuavaEventBusComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-guava-eventbus/src/main/java/org/apache/camel/component/guava/eventbus/springboot/GuavaEventBusComponentAutoConfiguration.java b/components/camel-guava-eventbus/src/main/java/org/apache/camel/component/guava/eventbus/springboot/GuavaEventBusComponentAutoConfiguration.java
index 0649735..140c1e7 100644
--- a/components/camel-guava-eventbus/src/main/java/org/apache/camel/component/guava/eventbus/springboot/GuavaEventBusComponentAutoConfiguration.java
+++ b/components/camel-guava-eventbus/src/main/java/org/apache/camel/component/guava/eventbus/springboot/GuavaEventBusComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(GuavaEventBusComponentConfiguration.class)
public class GuavaEventBusComponentAutoConfiguration {
- @Bean
+ @Bean(name = "guava-eventbus-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(GuavaEventBusComponent.class)
public GuavaEventBusComponent configureGuavaEventBusComponent(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/springboot/HazelcastComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/springboot/HazelcastComponentAutoConfiguration.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/springboot/HazelcastComponentAutoConfiguration.java
index bb93f6b..1b6f679 100644
--- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/springboot/HazelcastComponentAutoConfiguration.java
+++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/springboot/HazelcastComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(HazelcastComponentConfiguration.class)
public class HazelcastComponentAutoConfiguration {
- @Bean
+ @Bean(name = "hazelcast-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(HazelcastComponent.class)
public HazelcastComponent configureHazelcastComponent(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/springboot/HBaseComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/springboot/HBaseComponentAutoConfiguration.java b/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/springboot/HBaseComponentAutoConfiguration.java
index 20091d6..7334d6a 100644
--- a/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/springboot/HBaseComponentAutoConfiguration.java
+++ b/components/camel-hbase/src/main/java/org/apache/camel/component/hbase/springboot/HBaseComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(HBaseComponentConfiguration.class)
public class HBaseComponentAutoConfiguration {
- @Bean
+ @Bean(name = "hbase-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(HBaseComponent.class)
public HBaseComponent configureHBaseComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/springboot/HdfsComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/springboot/HdfsComponentAutoConfiguration.java b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/springboot/HdfsComponentAutoConfiguration.java
index ec0cd0f..ab72ef7 100644
--- a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/springboot/HdfsComponentAutoConfiguration.java
+++ b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/springboot/HdfsComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(HdfsComponentConfiguration.class)
public class HdfsComponentAutoConfiguration {
- @Bean
+ @Bean(name = "hdfs-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(HdfsComponent.class)
public HdfsComponent configureHdfsComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/springboot/HdfsComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/springboot/HdfsComponentAutoConfiguration.java b/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/springboot/HdfsComponentAutoConfiguration.java
index 18eb282..92a1fac 100644
--- a/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/springboot/HdfsComponentAutoConfiguration.java
+++ b/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/springboot/HdfsComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(HdfsComponentConfiguration.class)
public class HdfsComponentAutoConfiguration {
- @Bean
+ @Bean(name = "hdfs2-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(HdfsComponent.class)
public HdfsComponent configureHdfsComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-hessian/src/main/java/org/apache/camel/dataformat/hessian/springboot/HessianDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-hessian/src/main/java/org/apache/camel/dataformat/hessian/springboot/HessianDataFormatAutoConfiguration.java b/components/camel-hessian/src/main/java/org/apache/camel/dataformat/hessian/springboot/HessianDataFormatAutoConfiguration.java
index cd6e2e6..6243ba8 100644
--- a/components/camel-hessian/src/main/java/org/apache/camel/dataformat/hessian/springboot/HessianDataFormatAutoConfiguration.java
+++ b/components/camel-hessian/src/main/java/org/apache/camel/dataformat/hessian/springboot/HessianDataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(HessianDataFormatConfiguration.class)
public class HessianDataFormatAutoConfiguration {
- @Bean
+ @Bean(name = "hessian-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(HessianDataFormat.class)
public HessianDataFormat configureHessianDataFormat(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/springboot/HL7DataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/springboot/HL7DataFormatAutoConfiguration.java b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/springboot/HL7DataFormatAutoConfiguration.java
index 5da004e..b34409d 100644
--- a/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/springboot/HL7DataFormatAutoConfiguration.java
+++ b/components/camel-hl7/src/main/java/org/apache/camel/component/hl7/springboot/HL7DataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(HL7DataFormatConfiguration.class)
public class HL7DataFormatAutoConfiguration {
- @Bean
+ @Bean(name = "hl7-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(HL7DataFormat.class)
public HL7DataFormat configureHL7DataFormat(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-http/src/main/java/org/apache/camel/component/http/springboot/HttpComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http/springboot/HttpComponentAutoConfiguration.java b/components/camel-http/src/main/java/org/apache/camel/component/http/springboot/HttpComponentAutoConfiguration.java
index 4ebdab6..90b789e 100644
--- a/components/camel-http/src/main/java/org/apache/camel/component/http/springboot/HttpComponentAutoConfiguration.java
+++ b/components/camel-http/src/main/java/org/apache/camel/component/http/springboot/HttpComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(HttpComponentConfiguration.class)
public class HttpComponentAutoConfiguration {
- @Bean
+ @Bean(name = "http-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(HttpComponent.class)
public HttpComponent configureHttpComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-http4/src/main/java/org/apache/camel/component/http4/springboot/HttpComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-http4/src/main/java/org/apache/camel/component/http4/springboot/HttpComponentAutoConfiguration.java b/components/camel-http4/src/main/java/org/apache/camel/component/http4/springboot/HttpComponentAutoConfiguration.java
index ea5c9f9..6459f12 100644
--- a/components/camel-http4/src/main/java/org/apache/camel/component/http4/springboot/HttpComponentAutoConfiguration.java
+++ b/components/camel-http4/src/main/java/org/apache/camel/component/http4/springboot/HttpComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(HttpComponentConfiguration.class)
public class HttpComponentAutoConfiguration {
- @Bean
+ @Bean(name = "http4-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(HttpComponent.class)
public HttpComponent configureHttpComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/springboot/IBatisComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/springboot/IBatisComponentAutoConfiguration.java b/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/springboot/IBatisComponentAutoConfiguration.java
index 8b76646..6946ea4 100644
--- a/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/springboot/IBatisComponentAutoConfiguration.java
+++ b/components/camel-ibatis/src/main/java/org/apache/camel/component/ibatis/springboot/IBatisComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(IBatisComponentConfiguration.class)
public class IBatisComponentAutoConfiguration {
- @Bean
+ @Bean(name = "ibatis-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(IBatisComponent.class)
public IBatisComponent configureIBatisComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-ical/src/main/java/org/apache/camel/component/ical/springboot/ICalDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-ical/src/main/java/org/apache/camel/component/ical/springboot/ICalDataFormatAutoConfiguration.java b/components/camel-ical/src/main/java/org/apache/camel/component/ical/springboot/ICalDataFormatAutoConfiguration.java
index c1fd37e..60bab0d 100644
--- a/components/camel-ical/src/main/java/org/apache/camel/component/ical/springboot/ICalDataFormatAutoConfiguration.java
+++ b/components/camel-ical/src/main/java/org/apache/camel/component/ical/springboot/ICalDataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(ICalDataFormatConfiguration.class)
public class ICalDataFormatAutoConfiguration {
- @Bean
+ @Bean(name = "ical-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(ICalDataFormat.class)
public ICalDataFormat configureICalDataFormat(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatAutoConfiguration.java b/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatAutoConfiguration.java
index 8fb7c4c..f9dbaf4 100644
--- a/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatAutoConfiguration.java
+++ b/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(JacksonDataFormatConfiguration.class)
public class JacksonDataFormatAutoConfiguration {
- @Bean
+ @Bean(name = "json-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(JacksonDataFormat.class)
public JacksonDataFormat configureJacksonDataFormat(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-jacksonxml/src/main/java/org/apache/camel/component/jacksonxml/springboot/JacksonXMLDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-jacksonxml/src/main/java/org/apache/camel/component/jacksonxml/springboot/JacksonXMLDataFormatAutoConfiguration.java b/components/camel-jacksonxml/src/main/java/org/apache/camel/component/jacksonxml/springboot/JacksonXMLDataFormatAutoConfiguration.java
index 9ac370f..c035d7d 100644
--- a/components/camel-jacksonxml/src/main/java/org/apache/camel/component/jacksonxml/springboot/JacksonXMLDataFormatAutoConfiguration.java
+++ b/components/camel-jacksonxml/src/main/java/org/apache/camel/component/jacksonxml/springboot/JacksonXMLDataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(JacksonXMLDataFormatConfiguration.class)
public class JacksonXMLDataFormatAutoConfiguration {
- @Bean
+ @Bean(name = "jacksonxml-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(JacksonXMLDataFormat.class)
public JacksonXMLDataFormat configureJacksonXMLDataFormat(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatAutoConfiguration.java b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatAutoConfiguration.java
index 9b82553..846e518 100644
--- a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatAutoConfiguration.java
+++ b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(JaxbDataFormatConfiguration.class)
public class JaxbDataFormatAutoConfiguration {
- @Bean
+ @Bean(name = "jaxb-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(JaxbDataFormat.class)
public JaxbDataFormat configureJaxbDataFormat(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/springboot/JcloudsComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/springboot/JcloudsComponentAutoConfiguration.java b/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/springboot/JcloudsComponentAutoConfiguration.java
index 2c4b758..5d184c0 100644
--- a/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/springboot/JcloudsComponentAutoConfiguration.java
+++ b/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/springboot/JcloudsComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(JcloudsComponentConfiguration.class)
public class JcloudsComponentAutoConfiguration {
- @Bean
+ @Bean(name = "jclouds-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(JcloudsComponent.class)
public JcloudsComponent configureJcloudsComponent(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/springboot/JdbcComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/springboot/JdbcComponentAutoConfiguration.java b/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/springboot/JdbcComponentAutoConfiguration.java
index cb02772..13ad304 100644
--- a/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/springboot/JdbcComponentAutoConfiguration.java
+++ b/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/springboot/JdbcComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(JdbcComponentConfiguration.class)
public class JdbcComponentAutoConfiguration {
- @Bean
+ @Bean(name = "jdbc-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(JdbcComponent.class)
public JdbcComponent configureJdbcComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/springboot/JGroupsComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/springboot/JGroupsComponentAutoConfiguration.java b/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/springboot/JGroupsComponentAutoConfiguration.java
index 218bd76..d44e3b8 100644
--- a/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/springboot/JGroupsComponentAutoConfiguration.java
+++ b/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/springboot/JGroupsComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(JGroupsComponentConfiguration.class)
public class JGroupsComponentAutoConfiguration {
- @Bean
+ @Bean(name = "jgroups-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(JGroupsComponent.class)
public JGroupsComponent configureJGroupsComponent(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-jibx/src/main/java/org/apache/camel/dataformat/jibx/springboot/JibxDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-jibx/src/main/java/org/apache/camel/dataformat/jibx/springboot/JibxDataFormatAutoConfiguration.java b/components/camel-jibx/src/main/java/org/apache/camel/dataformat/jibx/springboot/JibxDataFormatAutoConfiguration.java
index efd6ca4..10a3fa5 100644
--- a/components/camel-jibx/src/main/java/org/apache/camel/dataformat/jibx/springboot/JibxDataFormatAutoConfiguration.java
+++ b/components/camel-jibx/src/main/java/org/apache/camel/dataformat/jibx/springboot/JibxDataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(JibxDataFormatConfiguration.class)
public class JibxDataFormatAutoConfiguration {
- @Bean
+ @Bean(name = "jibx-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(JibxDataFormat.class)
public JibxDataFormat configureJibxDataFormat(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-jms/src/main/java/org/apache/camel/component/jms/springboot/JmsComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/springboot/JmsComponentAutoConfiguration.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/springboot/JmsComponentAutoConfiguration.java
index af4733f..9d689cb 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/springboot/JmsComponentAutoConfiguration.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/springboot/JmsComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(JmsComponentConfiguration.class)
public class JmsComponentAutoConfiguration {
- @Bean
+ @Bean(name = "jms-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(JmsComponent.class)
public JmsComponent configureJmsComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-johnzon/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-johnzon/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatAutoConfiguration.java b/components/camel-johnzon/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatAutoConfiguration.java
index 0c50878..15b4183 100644
--- a/components/camel-johnzon/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatAutoConfiguration.java
+++ b/components/camel-johnzon/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(JohnzonDataFormatConfiguration.class)
public class JohnzonDataFormatAutoConfiguration {
- @Bean
+ @Bean(name = "json-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(JohnzonDataFormat.class)
public JohnzonDataFormat configureJohnzonDataFormat(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/springboot/JoltComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/springboot/JoltComponentAutoConfiguration.java b/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/springboot/JoltComponentAutoConfiguration.java
index 12fbeb9..1531848 100644
--- a/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/springboot/JoltComponentAutoConfiguration.java
+++ b/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/springboot/JoltComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(JoltComponentConfiguration.class)
public class JoltComponentAutoConfiguration {
- @Bean
+ @Bean(name = "jolt-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(JoltComponent.class)
public JoltComponent configureJoltComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/springboot/JpaComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/springboot/JpaComponentAutoConfiguration.java b/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/springboot/JpaComponentAutoConfiguration.java
index c6e176b..2723d49 100644
--- a/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/springboot/JpaComponentAutoConfiguration.java
+++ b/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/springboot/JpaComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(JpaComponentConfiguration.class)
public class JpaComponentAutoConfiguration {
- @Bean
+ @Bean(name = "jpa-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(JpaComponent.class)
public JpaComponent configureJpaComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/springboot/Jt400ComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/springboot/Jt400ComponentAutoConfiguration.java b/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/springboot/Jt400ComponentAutoConfiguration.java
index 91b900a..cccfab7 100644
--- a/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/springboot/Jt400ComponentAutoConfiguration.java
+++ b/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/springboot/Jt400ComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(Jt400ComponentConfiguration.class)
public class Jt400ComponentAutoConfiguration {
- @Bean
+ @Bean(name = "jt400-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(Jt400Component.class)
public Jt400Component configureJt400Component(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentAutoConfiguration.java b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentAutoConfiguration.java
index d1239ea..b2f4075 100644
--- a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentAutoConfiguration.java
+++ b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(KafkaComponentConfiguration.class)
public class KafkaComponentAutoConfiguration {
- @Bean
+ @Bean(name = "kafka-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(KafkaComponent.class)
public KafkaComponent configureKafkaComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-kestrel/src/main/java/org/apache/camel/component/kestrel/springboot/KestrelComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-kestrel/src/main/java/org/apache/camel/component/kestrel/springboot/KestrelComponentAutoConfiguration.java b/components/camel-kestrel/src/main/java/org/apache/camel/component/kestrel/springboot/KestrelComponentAutoConfiguration.java
index 568ccfe..83adabb 100644
--- a/components/camel-kestrel/src/main/java/org/apache/camel/component/kestrel/springboot/KestrelComponentAutoConfiguration.java
+++ b/components/camel-kestrel/src/main/java/org/apache/camel/component/kestrel/springboot/KestrelComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(KestrelComponentConfiguration.class)
public class KestrelComponentAutoConfiguration {
- @Bean
+ @Bean(name = "kestrel-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(KestrelComponent.class)
public KestrelComponent configureKestrelComponent(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-linkedin/camel-linkedin-component/src/main/java/org/apache/camel/component/linkedin/springboot/LinkedInComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-linkedin/camel-linkedin-component/src/main/java/org/apache/camel/component/linkedin/springboot/LinkedInComponentAutoConfiguration.java b/components/camel-linkedin/camel-linkedin-component/src/main/java/org/apache/camel/component/linkedin/springboot/LinkedInComponentAutoConfiguration.java
index b264a6d..95a6077 100644
--- a/components/camel-linkedin/camel-linkedin-component/src/main/java/org/apache/camel/component/linkedin/springboot/LinkedInComponentAutoConfiguration.java
+++ b/components/camel-linkedin/camel-linkedin-component/src/main/java/org/apache/camel/component/linkedin/springboot/LinkedInComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(LinkedInComponentConfiguration.class)
public class LinkedInComponentAutoConfiguration {
- @Bean
+ @Bean(name = "linkedin-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(LinkedInComponent.class)
public LinkedInComponent configureLinkedInComponent(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/springboot/LuceneComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/springboot/LuceneComponentAutoConfiguration.java b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/springboot/LuceneComponentAutoConfiguration.java
index 5a477b9..f4517b0 100644
--- a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/springboot/LuceneComponentAutoConfiguration.java
+++ b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/springboot/LuceneComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(LuceneComponentConfiguration.class)
public class LuceneComponentAutoConfiguration {
- @Bean
+ @Bean(name = "lucene-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(LuceneComponent.class)
public LuceneComponent configureLuceneComponent(CamelContext camelContext,
[6/9] camel git commit: Changed names and aliases of the beans
Posted by da...@apache.org.
Changed names and aliases of the beans
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/84e30b41
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/84e30b41
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/84e30b41
Branch: refs/heads/master
Commit: 84e30b41937bb9f1d0f5a87cb8a2a00a7e6daa54
Parents: d80f93c
Author: Nicola Ferraro <ni...@gmail.com>
Authored: Thu Jul 28 09:35:38 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jul 28 15:24:18 2016 +0200
----------------------------------------------------------------------
.../SpringBootAutoConfigurationMojo.java | 88 +++++++++++++-------
1 file changed, 58 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/84e30b41/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
index 375b1a4..aedcf49 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
@@ -21,12 +21,16 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
+import java.util.stream.Collectors;
import org.apache.camel.maven.packaging.model.ComponentModel;
import org.apache.camel.maven.packaging.model.ComponentOptionModel;
@@ -65,7 +69,6 @@ import static org.apache.camel.maven.packaging.PackageHelper.loadText;
public class SpringBootAutoConfigurationMojo extends AbstractMojo {
private static final String[] SKIP_COMPONENTS = new String[]{"ahc-wss", "cometds", "https", "http4s", "smpps", "solrs", "solrCloud"};
- private static final String[] MAIL_COMPONENTS = new String[]{"imap", "imaps", "pop3", "pop3s", "smtp", "smtps"};
/**
* The maven project.
@@ -122,46 +125,67 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo {
// create auto configuration for the components
if (!componentNames.isEmpty()) {
getLog().debug("Found " + componentNames.size() + " components");
+
+ List<ComponentModel> allModels = new LinkedList<>();
for (String componentName : componentNames) {
// skip some components which is duplicates
- boolean skip = false;
- for (String name : SKIP_COMPONENTS) {
- if (name.equals(componentName)) {
- skip = true;
- }
- }
+ boolean skip = Arrays.asList(SKIP_COMPONENTS).contains(componentName);
if (skip) {
continue;
}
- // mail component should just be mail
- String overrideComponentName = null;
- for (String name : MAIL_COMPONENTS) {
- if (name.equals(componentName)) {
- overrideComponentName = "mail";
- break;
- }
- }
-
String json = loadComponentJson(jsonFiles, componentName);
if (json != null) {
ComponentModel model = generateComponentModel(componentName, json);
+ allModels.add(model);
+ }
+ }
- // only create source code if the component has options that can be used in auto configuration
- if (!model.getComponentOptions().isEmpty()) {
-
- // use springboot as sub package name so the code is not in normal
- // package so the Spring Boot JARs can be optional at runtime
- int pos = model.getJavaType().lastIndexOf(".");
- String pkg = model.getJavaType().substring(0, pos) + ".springboot";
-
- createComponentConfigurationSource(pkg, model, overrideComponentName);
- createComponentAutoConfigurationSource(pkg, model);
- createComponentSpringFactorySource(pkg, model);
+ // Group the models by implementing classes
+ Map<String, List<ComponentModel>> grModels = allModels.stream().collect(Collectors.groupingBy(m -> m.getJavaType()));
+ for(String componentClass : grModels.keySet()) {
+ List<ComponentModel> compModels = grModels.get(componentClass);
+ ComponentModel model = compModels.get(0); // They should be equivalent
+ List<String> aliases = compModels.stream().map(m -> m.getScheme()).collect(Collectors.toList());
+
+ // only create source code if the component has options that can be used in auto configuration
+ if (!model.getComponentOptions().isEmpty()) {
+
+ // use springboot as sub package name so the code is not in normal
+ // package so the Spring Boot JARs can be optional at runtime
+ int pos = model.getJavaType().lastIndexOf(".");
+ String pkg = model.getJavaType().substring(0, pos) + ".springboot";
+
+ String overrideComponentName = null;
+ if(aliases.size()>0) {
+ // determine component name when there are multiple ones
+ overrideComponentName = model.getArtifactId().replace("camel-", "");
}
+
+ createComponentConfigurationSource(pkg, model, overrideComponentName);
+ createComponentAutoConfigurationSource(pkg, model, aliases);
+ createComponentSpringFactorySource(pkg, model);
}
+
+
}
+
+ /*
+ // only create source code if the component has options that can be used in auto configuration
+ if (!model.getComponentOptions().isEmpty()) {
+
+ // use springboot as sub package name so the code is not in normal
+ // package so the Spring Boot JARs can be optional at runtime
+ int pos = model.getJavaType().lastIndexOf(".");
+ String pkg = model.getJavaType().substring(0, pos) + ".springboot";
+
+ createComponentConfigurationSource(pkg, model, overrideComponentName);
+ createComponentAutoConfigurationSource(pkg, model, Collections.singletonList(componentName));
+ createComponentSpringFactorySource(pkg, model);
+ }
+ */
+
}
}
@@ -364,7 +388,7 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo {
}
}
- private void createComponentAutoConfigurationSource(String packageName, ComponentModel model) throws MojoFailureException {
+ private void createComponentAutoConfigurationSource(String packageName, ComponentModel model, List<String> componentAliases) throws MojoFailureException {
final JavaClassSource javaClass = Roaster.create(JavaClassSource.class);
int pos = model.getJavaType().lastIndexOf(".");
@@ -402,7 +426,10 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo {
method.addParameter("CamelContext", "camelContext");
method.addParameter(configurationName, "configuration");
- method.addAnnotation(Bean.class);
+ // Determine all the aliases
+ String[] springBeanAliases = componentAliases.stream().map(alias -> alias + "-component").toArray(size -> new String[size]);
+
+ method.addAnnotation(Bean.class).setStringArrayValue("name", springBeanAliases);
method.addAnnotation(ConditionalOnClass.class).setLiteralValue("value", "CamelContext.class");
method.addAnnotation(ConditionalOnMissingBean.class).setLiteralValue("value", model.getShortJavaType() + ".class");
@@ -474,7 +501,8 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo {
method.addParameter("CamelContext", "camelContext");
method.addParameter(configurationName, "configuration");
- method.addAnnotation(Bean.class);
+ // adding the '-dataformat' suffix to prevent collision with component names
+ method.addAnnotation(Bean.class).setStringValue("name", model.getModelName() + "-dataformat");;
method.addAnnotation(ConditionalOnClass.class).setLiteralValue("value", "CamelContext.class");
method.addAnnotation(ConditionalOnMissingBean.class).setLiteralValue("value", model.getShortJavaType() + ".class");
[3/9] camel git commit: Added name to some components
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/springboot/LumberjackComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/springboot/LumberjackComponentAutoConfiguration.java b/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/springboot/LumberjackComponentAutoConfiguration.java
index 56c0466..009d941 100644
--- a/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/springboot/LumberjackComponentAutoConfiguration.java
+++ b/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/springboot/LumberjackComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(LumberjackComponentConfiguration.class)
public class LumberjackComponentAutoConfiguration {
- @Bean
+ @Bean(name = "lumberjack-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(LumberjackComponent.class)
public LumberjackComponent configureLumberjackComponent(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-lzf/src/main/java/org/apache/camel/dataformat/lzf/springboot/LZFDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-lzf/src/main/java/org/apache/camel/dataformat/lzf/springboot/LZFDataFormatAutoConfiguration.java b/components/camel-lzf/src/main/java/org/apache/camel/dataformat/lzf/springboot/LZFDataFormatAutoConfiguration.java
index ba84e01..46ba06a 100644
--- a/components/camel-lzf/src/main/java/org/apache/camel/dataformat/lzf/springboot/LZFDataFormatAutoConfiguration.java
+++ b/components/camel-lzf/src/main/java/org/apache/camel/dataformat/lzf/springboot/LZFDataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(LZFDataFormatConfiguration.class)
public class LZFDataFormatAutoConfiguration {
- @Bean
+ @Bean(name = "lzf-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(LZFDataFormat.class)
public LZFDataFormat configureLZFDataFormat(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-mail/src/main/java/org/apache/camel/component/mail/springboot/MailComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-mail/src/main/java/org/apache/camel/component/mail/springboot/MailComponentAutoConfiguration.java b/components/camel-mail/src/main/java/org/apache/camel/component/mail/springboot/MailComponentAutoConfiguration.java
index 74ea75b..d39dea1 100644
--- a/components/camel-mail/src/main/java/org/apache/camel/component/mail/springboot/MailComponentAutoConfiguration.java
+++ b/components/camel-mail/src/main/java/org/apache/camel/component/mail/springboot/MailComponentAutoConfiguration.java
@@ -34,7 +34,8 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(MailComponentConfiguration.class)
public class MailComponentAutoConfiguration {
- @Bean
+ @Bean(name = {"imaps-component", "imap-component", "pop3-component",
+ "smtps-component", "pop3s-component", "smtp-component"})
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(MailComponent.class)
public MailComponent configureMailComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-mail/src/main/java/org/apache/camel/dataformat/mime/multipart/springboot/MimeMultipartDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-mail/src/main/java/org/apache/camel/dataformat/mime/multipart/springboot/MimeMultipartDataFormatAutoConfiguration.java b/components/camel-mail/src/main/java/org/apache/camel/dataformat/mime/multipart/springboot/MimeMultipartDataFormatAutoConfiguration.java
index 697355d..5934038 100644
--- a/components/camel-mail/src/main/java/org/apache/camel/dataformat/mime/multipart/springboot/MimeMultipartDataFormatAutoConfiguration.java
+++ b/components/camel-mail/src/main/java/org/apache/camel/dataformat/mime/multipart/springboot/MimeMultipartDataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(MimeMultipartDataFormatConfiguration.class)
public class MimeMultipartDataFormatAutoConfiguration {
- @Bean
+ @Bean(name = "mime-multipart-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(MimeMultipartDataFormat.class)
public MimeMultipartDataFormat configureMimeMultipartDataFormat(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/springboot/MetricsComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/springboot/MetricsComponentAutoConfiguration.java b/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/springboot/MetricsComponentAutoConfiguration.java
index 82c13f4..7866bc1 100644
--- a/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/springboot/MetricsComponentAutoConfiguration.java
+++ b/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/springboot/MetricsComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(MetricsComponentConfiguration.class)
public class MetricsComponentAutoConfiguration {
- @Bean
+ @Bean(name = "metrics-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(MetricsComponent.class)
public MetricsComponent configureMetricsComponent(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-mina/src/main/java/org/apache/camel/component/mina/springboot/MinaComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-mina/src/main/java/org/apache/camel/component/mina/springboot/MinaComponentAutoConfiguration.java b/components/camel-mina/src/main/java/org/apache/camel/component/mina/springboot/MinaComponentAutoConfiguration.java
index 49ae11a..7f3cb30 100644
--- a/components/camel-mina/src/main/java/org/apache/camel/component/mina/springboot/MinaComponentAutoConfiguration.java
+++ b/components/camel-mina/src/main/java/org/apache/camel/component/mina/springboot/MinaComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(MinaComponentConfiguration.class)
public class MinaComponentAutoConfiguration {
- @Bean
+ @Bean(name = "mina-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(MinaComponent.class)
public MinaComponent configureMinaComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/springboot/Mina2ComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/springboot/Mina2ComponentAutoConfiguration.java b/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/springboot/Mina2ComponentAutoConfiguration.java
index d3d0a2a..b5e3524 100644
--- a/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/springboot/Mina2ComponentAutoConfiguration.java
+++ b/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/springboot/Mina2ComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(Mina2ComponentConfiguration.class)
public class Mina2ComponentAutoConfiguration {
- @Bean
+ @Bean(name = "mina2-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(Mina2Component.class)
public Mina2Component configureMina2Component(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/springboot/MQTTComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/springboot/MQTTComponentAutoConfiguration.java b/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/springboot/MQTTComponentAutoConfiguration.java
index 4cc4ebf..59767c4 100644
--- a/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/springboot/MQTTComponentAutoConfiguration.java
+++ b/components/camel-mqtt/src/main/java/org/apache/camel/component/mqtt/springboot/MQTTComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(MQTTComponentConfiguration.class)
public class MQTTComponentAutoConfiguration {
- @Bean
+ @Bean(name = "mqtt-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(MQTTComponent.class)
public MQTTComponent configureMQTTComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-msv/src/main/java/org/apache/camel/component/validator/msv/springboot/MsvComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-msv/src/main/java/org/apache/camel/component/validator/msv/springboot/MsvComponentAutoConfiguration.java b/components/camel-msv/src/main/java/org/apache/camel/component/validator/msv/springboot/MsvComponentAutoConfiguration.java
index fc33140..491f2e1 100644
--- a/components/camel-msv/src/main/java/org/apache/camel/component/validator/msv/springboot/MsvComponentAutoConfiguration.java
+++ b/components/camel-msv/src/main/java/org/apache/camel/component/validator/msv/springboot/MsvComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(MsvComponentConfiguration.class)
public class MsvComponentAutoConfiguration {
- @Bean
+ @Bean(name = "msv-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(MsvComponent.class)
public MsvComponent configureMsvComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-mustache/src/main/java/org/apache/camel/component/mustache/springboot/MustacheComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-mustache/src/main/java/org/apache/camel/component/mustache/springboot/MustacheComponentAutoConfiguration.java b/components/camel-mustache/src/main/java/org/apache/camel/component/mustache/springboot/MustacheComponentAutoConfiguration.java
index fa5c320..ae06419 100644
--- a/components/camel-mustache/src/main/java/org/apache/camel/component/mustache/springboot/MustacheComponentAutoConfiguration.java
+++ b/components/camel-mustache/src/main/java/org/apache/camel/component/mustache/springboot/MustacheComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(MustacheComponentConfiguration.class)
public class MustacheComponentAutoConfiguration {
- @Bean
+ @Bean(name = "mustache-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(MustacheComponent.class)
public MustacheComponent configureMustacheComponent(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/springboot/MyBatisComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/springboot/MyBatisComponentAutoConfiguration.java b/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/springboot/MyBatisComponentAutoConfiguration.java
index 9f9af62..d30be73 100644
--- a/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/springboot/MyBatisComponentAutoConfiguration.java
+++ b/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/springboot/MyBatisComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(MyBatisComponentConfiguration.class)
public class MyBatisComponentAutoConfiguration {
- @Bean
+ @Bean(name = "mybatis-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(MyBatisComponent.class)
public MyBatisComponent configureMyBatisComponent(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/springboot/NagiosComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/springboot/NagiosComponentAutoConfiguration.java b/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/springboot/NagiosComponentAutoConfiguration.java
index e81f443..cf6ab90 100644
--- a/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/springboot/NagiosComponentAutoConfiguration.java
+++ b/components/camel-nagios/src/main/java/org/apache/camel/component/nagios/springboot/NagiosComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(NagiosComponentConfiguration.class)
public class NagiosComponentAutoConfiguration {
- @Bean
+ @Bean(name = "nagios-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(NagiosComponent.class)
public NagiosComponent configureNagiosComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/springboot/NettyHttpComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/springboot/NettyHttpComponentAutoConfiguration.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/springboot/NettyHttpComponentAutoConfiguration.java
index abf5ddf..8fee1e5 100644
--- a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/springboot/NettyHttpComponentAutoConfiguration.java
+++ b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/springboot/NettyHttpComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(NettyHttpComponentConfiguration.class)
public class NettyHttpComponentAutoConfiguration {
- @Bean
+ @Bean(name = "netty-http-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(NettyHttpComponent.class)
public NettyHttpComponent configureNettyHttpComponent(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-netty/src/main/java/org/apache/camel/component/netty/springboot/NettyComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-netty/src/main/java/org/apache/camel/component/netty/springboot/NettyComponentAutoConfiguration.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty/springboot/NettyComponentAutoConfiguration.java
index bcc3e46..938f958 100644
--- a/components/camel-netty/src/main/java/org/apache/camel/component/netty/springboot/NettyComponentAutoConfiguration.java
+++ b/components/camel-netty/src/main/java/org/apache/camel/component/netty/springboot/NettyComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(NettyComponentConfiguration.class)
public class NettyComponentAutoConfiguration {
- @Bean
+ @Bean(name = "netty-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(NettyComponent.class)
public NettyComponent configureNettyComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/springboot/NettyHttpComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/springboot/NettyHttpComponentAutoConfiguration.java b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/springboot/NettyHttpComponentAutoConfiguration.java
index 71ca201..795c150 100644
--- a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/springboot/NettyHttpComponentAutoConfiguration.java
+++ b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/springboot/NettyHttpComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(NettyHttpComponentConfiguration.class)
public class NettyHttpComponentAutoConfiguration {
- @Bean
+ @Bean(name = "netty4-http-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(NettyHttpComponent.class)
public NettyHttpComponent configureNettyHttpComponent(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/springboot/NettyComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/springboot/NettyComponentAutoConfiguration.java b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/springboot/NettyComponentAutoConfiguration.java
index 0ad4bdb..03aeb8d 100644
--- a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/springboot/NettyComponentAutoConfiguration.java
+++ b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/springboot/NettyComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(NettyComponentConfiguration.class)
public class NettyComponentAutoConfiguration {
- @Bean
+ @Bean(name = "netty4-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(NettyComponent.class)
public NettyComponent configureNettyComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/springboot/Olingo2ComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/springboot/Olingo2ComponentAutoConfiguration.java b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/springboot/Olingo2ComponentAutoConfiguration.java
index 55888a7..07292ee 100644
--- a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/springboot/Olingo2ComponentAutoConfiguration.java
+++ b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/springboot/Olingo2ComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(Olingo2ComponentConfiguration.class)
public class Olingo2ComponentAutoConfiguration {
- @Bean
+ @Bean(name = "olingo2-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(Olingo2Component.class)
public Olingo2Component configureOlingo2Component(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/springboot/OpenShiftComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/springboot/OpenShiftComponentAutoConfiguration.java b/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/springboot/OpenShiftComponentAutoConfiguration.java
index 93fa051..26a8e5c 100644
--- a/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/springboot/OpenShiftComponentAutoConfiguration.java
+++ b/components/camel-openshift/src/main/java/org/apache/camel/component/openshift/springboot/OpenShiftComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(OpenShiftComponentConfiguration.class)
public class OpenShiftComponentAutoConfiguration {
- @Bean
+ @Bean(name = "openshift-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(OpenShiftComponent.class)
public OpenShiftComponent configureOpenShiftComponent(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-paho/src/main/java/org/apache/camel/component/paho/springboot/PahoComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-paho/src/main/java/org/apache/camel/component/paho/springboot/PahoComponentAutoConfiguration.java b/components/camel-paho/src/main/java/org/apache/camel/component/paho/springboot/PahoComponentAutoConfiguration.java
index a8d9d23..eb7b8d4 100644
--- a/components/camel-paho/src/main/java/org/apache/camel/component/paho/springboot/PahoComponentAutoConfiguration.java
+++ b/components/camel-paho/src/main/java/org/apache/camel/component/paho/springboot/PahoComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(PahoComponentConfiguration.class)
public class PahoComponentAutoConfiguration {
- @Bean
+ @Bean(name = "paho-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(PahoComponent.class)
public PahoComponent configurePahoComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/springboot/PaxLoggingComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/springboot/PaxLoggingComponentAutoConfiguration.java b/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/springboot/PaxLoggingComponentAutoConfiguration.java
index 03ac02c..c741dc6 100644
--- a/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/springboot/PaxLoggingComponentAutoConfiguration.java
+++ b/components/camel-paxlogging/src/main/java/org/apache/camel/component/paxlogging/springboot/PaxLoggingComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(PaxLoggingComponentConfiguration.class)
public class PaxLoggingComponentAutoConfiguration {
- @Bean
+ @Bean(name = "paxlogging-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(PaxLoggingComponent.class)
public PaxLoggingComponent configurePaxLoggingComponent(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-protobuf/src/main/java/org/apache/camel/dataformat/protobuf/springboot/ProtobufDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-protobuf/src/main/java/org/apache/camel/dataformat/protobuf/springboot/ProtobufDataFormatAutoConfiguration.java b/components/camel-protobuf/src/main/java/org/apache/camel/dataformat/protobuf/springboot/ProtobufDataFormatAutoConfiguration.java
index c522438..407e2b8 100644
--- a/components/camel-protobuf/src/main/java/org/apache/camel/dataformat/protobuf/springboot/ProtobufDataFormatAutoConfiguration.java
+++ b/components/camel-protobuf/src/main/java/org/apache/camel/dataformat/protobuf/springboot/ProtobufDataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(ProtobufDataFormatConfiguration.class)
public class ProtobufDataFormatAutoConfiguration {
- @Bean
+ @Bean(name = "protobuf-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(ProtobufDataFormat.class)
public ProtobufDataFormat configureProtobufDataFormat(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/springboot/QuartzComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/springboot/QuartzComponentAutoConfiguration.java b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/springboot/QuartzComponentAutoConfiguration.java
index 9b04902..6a01589 100644
--- a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/springboot/QuartzComponentAutoConfiguration.java
+++ b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/springboot/QuartzComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(QuartzComponentConfiguration.class)
public class QuartzComponentAutoConfiguration {
- @Bean
+ @Bean(name = "quartz-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(QuartzComponent.class)
public QuartzComponent configureQuartzComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/springboot/QuartzComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/springboot/QuartzComponentAutoConfiguration.java b/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/springboot/QuartzComponentAutoConfiguration.java
index c8fccbc..eb06660 100644
--- a/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/springboot/QuartzComponentAutoConfiguration.java
+++ b/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/springboot/QuartzComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(QuartzComponentConfiguration.class)
public class QuartzComponentAutoConfiguration {
- @Bean
+ @Bean(name = "quartz2-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(QuartzComponent.class)
public QuartzComponent configureQuartzComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/springboot/QuickfixjComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/springboot/QuickfixjComponentAutoConfiguration.java b/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/springboot/QuickfixjComponentAutoConfiguration.java
index a8736ae..149e961 100644
--- a/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/springboot/QuickfixjComponentAutoConfiguration.java
+++ b/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/springboot/QuickfixjComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(QuickfixjComponentConfiguration.class)
public class QuickfixjComponentAutoConfiguration {
- @Bean
+ @Bean(name = "quickfix-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(QuickfixjComponent.class)
public QuickfixjComponent configureQuickfixjComponent(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/springboot/RestletComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/springboot/RestletComponentAutoConfiguration.java b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/springboot/RestletComponentAutoConfiguration.java
index e9d1c2b..ca57cd3 100644
--- a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/springboot/RestletComponentAutoConfiguration.java
+++ b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/springboot/RestletComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(RestletComponentConfiguration.class)
public class RestletComponentAutoConfiguration {
- @Bean
+ @Bean(name = "restlet-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(RestletComponent.class)
public RestletComponent configureRestletComponent(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-rss/src/main/java/org/apache/camel/dataformat/rss/springboot/RssDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-rss/src/main/java/org/apache/camel/dataformat/rss/springboot/RssDataFormatAutoConfiguration.java b/components/camel-rss/src/main/java/org/apache/camel/dataformat/rss/springboot/RssDataFormatAutoConfiguration.java
index c51f6e1..189248a 100644
--- a/components/camel-rss/src/main/java/org/apache/camel/dataformat/rss/springboot/RssDataFormatAutoConfiguration.java
+++ b/components/camel-rss/src/main/java/org/apache/camel/dataformat/rss/springboot/RssDataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(RssDataFormatConfiguration.class)
public class RssDataFormatAutoConfiguration {
- @Bean
+ @Bean(name = "rss-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(RssDataFormat.class)
public RssDataFormat configureRssDataFormat(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentAutoConfiguration.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentAutoConfiguration.java
index 1dfb3c7..e73550c 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentAutoConfiguration.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(SalesforceComponentConfiguration.class)
public class SalesforceComponentAutoConfiguration {
- @Bean
+ @Bean(name = "salesforce-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(SalesforceComponent.class)
public SalesforceComponent configureSalesforceComponent(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/springboot/ServletComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/springboot/ServletComponentAutoConfiguration.java b/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/springboot/ServletComponentAutoConfiguration.java
index 1895185..606e188 100644
--- a/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/springboot/ServletComponentAutoConfiguration.java
+++ b/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/springboot/ServletComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(ServletComponentConfiguration.class)
public class ServletComponentAutoConfiguration {
- @Bean
+ @Bean(name = "servlet-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(ServletComponent.class)
public ServletComponent configureServletComponent(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-slack/src/main/java/org/apache/camel/component/slack/springboot/SlackComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-slack/src/main/java/org/apache/camel/component/slack/springboot/SlackComponentAutoConfiguration.java b/components/camel-slack/src/main/java/org/apache/camel/component/slack/springboot/SlackComponentAutoConfiguration.java
index bc6ce6b..7b891ba 100644
--- a/components/camel-slack/src/main/java/org/apache/camel/component/slack/springboot/SlackComponentAutoConfiguration.java
+++ b/components/camel-slack/src/main/java/org/apache/camel/component/slack/springboot/SlackComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(SlackComponentConfiguration.class)
public class SlackComponentAutoConfiguration {
- @Bean
+ @Bean(name = "slack-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(SlackComponent.class)
public SlackComponent configureSlackComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/springboot/SmppComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/springboot/SmppComponentAutoConfiguration.java b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/springboot/SmppComponentAutoConfiguration.java
index 0133753..0e91188 100644
--- a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/springboot/SmppComponentAutoConfiguration.java
+++ b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/springboot/SmppComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(SmppComponentConfiguration.class)
public class SmppComponentAutoConfiguration {
- @Bean
+ @Bean(name = "smpp-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(SmppComponent.class)
public SmppComponent configureSmppComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-snakeyaml/src/main/java/org/apache/camel/component/snakeyaml/springboot/SnakeYAMLDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-snakeyaml/src/main/java/org/apache/camel/component/snakeyaml/springboot/SnakeYAMLDataFormatAutoConfiguration.java b/components/camel-snakeyaml/src/main/java/org/apache/camel/component/snakeyaml/springboot/SnakeYAMLDataFormatAutoConfiguration.java
index a38d523..a8df7f7 100644
--- a/components/camel-snakeyaml/src/main/java/org/apache/camel/component/snakeyaml/springboot/SnakeYAMLDataFormatAutoConfiguration.java
+++ b/components/camel-snakeyaml/src/main/java/org/apache/camel/component/snakeyaml/springboot/SnakeYAMLDataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(SnakeYAMLDataFormatConfiguration.class)
public class SnakeYAMLDataFormatAutoConfiguration {
- @Bean
+ @Bean(name = "yaml-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(SnakeYAMLDataFormat.class)
public SnakeYAMLDataFormat configureSnakeYAMLDataFormat(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/springboot/SoapJaxbDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/springboot/SoapJaxbDataFormatAutoConfiguration.java b/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/springboot/SoapJaxbDataFormatAutoConfiguration.java
index 68af579..b703e06 100644
--- a/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/springboot/SoapJaxbDataFormatAutoConfiguration.java
+++ b/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/springboot/SoapJaxbDataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(SoapJaxbDataFormatConfiguration.class)
public class SoapJaxbDataFormatAutoConfiguration {
- @Bean
+ @Bean(name = "soapjaxb-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(SoapJaxbDataFormat.class)
public SoapJaxbDataFormat configureSoapJaxbDataFormat(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/springboot/SparkComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/springboot/SparkComponentAutoConfiguration.java b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/springboot/SparkComponentAutoConfiguration.java
index ecc4149..0c946cd 100644
--- a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/springboot/SparkComponentAutoConfiguration.java
+++ b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/springboot/SparkComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(SparkComponentConfiguration.class)
public class SparkComponentAutoConfiguration {
- @Bean
+ @Bean(name = "spark-rest-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(SparkComponent.class)
public SparkComponent configureSparkComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-spark/src/main/java/org/apache/camel/component/spark/springboot/SparkComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-spark/src/main/java/org/apache/camel/component/spark/springboot/SparkComponentAutoConfiguration.java b/components/camel-spark/src/main/java/org/apache/camel/component/spark/springboot/SparkComponentAutoConfiguration.java
index a9737cc..0f6e970 100644
--- a/components/camel-spark/src/main/java/org/apache/camel/component/spark/springboot/SparkComponentAutoConfiguration.java
+++ b/components/camel-spark/src/main/java/org/apache/camel/component/spark/springboot/SparkComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(SparkComponentConfiguration.class)
public class SparkComponentAutoConfiguration {
- @Bean
+ @Bean(name = "spark-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(SparkComponent.class)
public SparkComponent configureSparkComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/springboot/SplunkComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/springboot/SplunkComponentAutoConfiguration.java b/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/springboot/SplunkComponentAutoConfiguration.java
index bd6e182..8a968eb 100644
--- a/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/springboot/SplunkComponentAutoConfiguration.java
+++ b/components/camel-splunk/src/main/java/org/apache/camel/component/splunk/springboot/SplunkComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(SplunkComponentConfiguration.class)
public class SplunkComponentAutoConfiguration {
- @Bean
+ @Bean(name = "splunk-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(SplunkComponent.class)
public SplunkComponent configureSplunkComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/springboot/SpringBatchComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/springboot/SpringBatchComponentAutoConfiguration.java b/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/springboot/SpringBatchComponentAutoConfiguration.java
index 28936d4..3ffd8c6 100644
--- a/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/springboot/SpringBatchComponentAutoConfiguration.java
+++ b/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/springboot/SpringBatchComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(SpringBatchComponentConfiguration.class)
public class SpringBatchComponentAutoConfiguration {
- @Bean
+ @Bean(name = "spring-batch-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(SpringBatchComponent.class)
public SpringBatchComponent configureSpringBatchComponent(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/springboot/SshComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/springboot/SshComponentAutoConfiguration.java b/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/springboot/SshComponentAutoConfiguration.java
index 20cdf70..d7dd8a5 100644
--- a/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/springboot/SshComponentAutoConfiguration.java
+++ b/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/springboot/SshComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(SshComponentConfiguration.class)
public class SshComponentAutoConfiguration {
- @Bean
+ @Bean(name = "ssh-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(SshComponent.class)
public SshComponent configureSshComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/springboot/StompComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/springboot/StompComponentAutoConfiguration.java b/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/springboot/StompComponentAutoConfiguration.java
index 73c0819..1955e56 100644
--- a/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/springboot/StompComponentAutoConfiguration.java
+++ b/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/springboot/StompComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(StompComponentConfiguration.class)
public class StompComponentAutoConfiguration {
- @Bean
+ @Bean(name = "stomp-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(StompComponent.class)
public StompComponent configureStompComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/springboot/SyslogDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/springboot/SyslogDataFormatAutoConfiguration.java b/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/springboot/SyslogDataFormatAutoConfiguration.java
index 3b78a10..0e55b9f 100644
--- a/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/springboot/SyslogDataFormatAutoConfiguration.java
+++ b/components/camel-syslog/src/main/java/org/apache/camel/component/syslog/springboot/SyslogDataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(SyslogDataFormatConfiguration.class)
public class SyslogDataFormatAutoConfiguration {
- @Bean
+ @Bean(name = "syslog-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(SyslogDataFormat.class)
public SyslogDataFormat configureSyslogDataFormat(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-tagsoup/src/main/java/org/apache/camel/dataformat/tagsoup/springboot/TidyMarkupDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-tagsoup/src/main/java/org/apache/camel/dataformat/tagsoup/springboot/TidyMarkupDataFormatAutoConfiguration.java b/components/camel-tagsoup/src/main/java/org/apache/camel/dataformat/tagsoup/springboot/TidyMarkupDataFormatAutoConfiguration.java
index 4985a3b..0e8c37b 100644
--- a/components/camel-tagsoup/src/main/java/org/apache/camel/dataformat/tagsoup/springboot/TidyMarkupDataFormatAutoConfiguration.java
+++ b/components/camel-tagsoup/src/main/java/org/apache/camel/dataformat/tagsoup/springboot/TidyMarkupDataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(TidyMarkupDataFormatConfiguration.class)
public class TidyMarkupDataFormatAutoConfiguration {
- @Bean
+ @Bean(name = "tidyMarkup-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(TidyMarkupDataFormat.class)
public TidyMarkupDataFormat configureTidyMarkupDataFormat(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-tarfile/src/main/java/org/apache/camel/dataformat/tarfile/springboot/TarFileDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-tarfile/src/main/java/org/apache/camel/dataformat/tarfile/springboot/TarFileDataFormatAutoConfiguration.java b/components/camel-tarfile/src/main/java/org/apache/camel/dataformat/tarfile/springboot/TarFileDataFormatAutoConfiguration.java
index ae88b60..41ea373 100644
--- a/components/camel-tarfile/src/main/java/org/apache/camel/dataformat/tarfile/springboot/TarFileDataFormatAutoConfiguration.java
+++ b/components/camel-tarfile/src/main/java/org/apache/camel/dataformat/tarfile/springboot/TarFileDataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(TarFileDataFormatConfiguration.class)
public class TarFileDataFormatAutoConfiguration {
- @Bean
+ @Bean(name = "tarfile-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(TarFileDataFormat.class)
public TarFileDataFormat configureTarFileDataFormat(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/springboot/TwitterComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/springboot/TwitterComponentAutoConfiguration.java b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/springboot/TwitterComponentAutoConfiguration.java
index 4740bc3..7e82c23 100644
--- a/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/springboot/TwitterComponentAutoConfiguration.java
+++ b/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/springboot/TwitterComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(TwitterComponentConfiguration.class)
public class TwitterComponentAutoConfiguration {
- @Bean
+ @Bean(name = "twitter-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(TwitterComponent.class)
public TwitterComponent configureTwitterComponent(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/springboot/UndertowComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/springboot/UndertowComponentAutoConfiguration.java b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/springboot/UndertowComponentAutoConfiguration.java
index 548f9f5..6e18352 100644
--- a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/springboot/UndertowComponentAutoConfiguration.java
+++ b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/springboot/UndertowComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(UndertowComponentConfiguration.class)
public class UndertowComponentAutoConfiguration {
- @Bean
+ @Bean(name = "undertow-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(UndertowComponent.class)
public UndertowComponent configureUndertowComponent(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-univocity-parsers/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityCsvDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-univocity-parsers/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityCsvDataFormatAutoConfiguration.java b/components/camel-univocity-parsers/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityCsvDataFormatAutoConfiguration.java
index e70d780..f79a404 100644
--- a/components/camel-univocity-parsers/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityCsvDataFormatAutoConfiguration.java
+++ b/components/camel-univocity-parsers/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityCsvDataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(UniVocityCsvDataFormatConfiguration.class)
public class UniVocityCsvDataFormatAutoConfiguration {
- @Bean
+ @Bean(name = "univocity-csv-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(UniVocityCsvDataFormat.class)
public UniVocityCsvDataFormat configureUniVocityCsvDataFormat(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-univocity-parsers/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityFixedWidthDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-univocity-parsers/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityFixedWidthDataFormatAutoConfiguration.java b/components/camel-univocity-parsers/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityFixedWidthDataFormatAutoConfiguration.java
index 66a7bf4..0ff29da 100644
--- a/components/camel-univocity-parsers/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityFixedWidthDataFormatAutoConfiguration.java
+++ b/components/camel-univocity-parsers/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityFixedWidthDataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(UniVocityFixedWidthDataFormatConfiguration.class)
public class UniVocityFixedWidthDataFormatAutoConfiguration {
- @Bean
+ @Bean(name = "univocity-fixed-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(UniVocityFixedWidthDataFormat.class)
public UniVocityFixedWidthDataFormat configureUniVocityFixedWidthDataFormat(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-univocity-parsers/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityTsvDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-univocity-parsers/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityTsvDataFormatAutoConfiguration.java b/components/camel-univocity-parsers/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityTsvDataFormatAutoConfiguration.java
index f313989..051aa69 100644
--- a/components/camel-univocity-parsers/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityTsvDataFormatAutoConfiguration.java
+++ b/components/camel-univocity-parsers/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityTsvDataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(UniVocityTsvDataFormatConfiguration.class)
public class UniVocityTsvDataFormatAutoConfiguration {
- @Bean
+ @Bean(name = "univocity-tsv-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(UniVocityTsvDataFormat.class)
public UniVocityTsvDataFormat configureUniVocityTsvDataFormat(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/springboot/VelocityComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/springboot/VelocityComponentAutoConfiguration.java b/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/springboot/VelocityComponentAutoConfiguration.java
index bd33481..be0b585 100644
--- a/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/springboot/VelocityComponentAutoConfiguration.java
+++ b/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/springboot/VelocityComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(VelocityComponentConfiguration.class)
public class VelocityComponentAutoConfiguration {
- @Bean
+ @Bean(name = "velocity-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(VelocityComponent.class)
public VelocityComponent configureVelocityComponent(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-vertx/src/main/java/org/apache/camel/component/vertx/springboot/VertxComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-vertx/src/main/java/org/apache/camel/component/vertx/springboot/VertxComponentAutoConfiguration.java b/components/camel-vertx/src/main/java/org/apache/camel/component/vertx/springboot/VertxComponentAutoConfiguration.java
index 4ebcf90..57f3d1b 100644
--- a/components/camel-vertx/src/main/java/org/apache/camel/component/vertx/springboot/VertxComponentAutoConfiguration.java
+++ b/components/camel-vertx/src/main/java/org/apache/camel/component/vertx/springboot/VertxComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(VertxComponentConfiguration.class)
public class VertxComponentAutoConfiguration {
- @Bean
+ @Bean(name = "vertx-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(VertxComponent.class)
public VertxComponent configureVertxComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentAutoConfiguration.java b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentAutoConfiguration.java
index 92a74be..afa2ea6 100644
--- a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentAutoConfiguration.java
+++ b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/springboot/WebsocketComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(WebsocketComponentConfiguration.class)
public class WebsocketComponentAutoConfiguration {
- @Bean
+ @Bean(name = "websocket-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(WebsocketComponent.class)
public WebsocketComponent configureWebsocketComponent(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-xmlbeans/src/main/java/org/apache/camel/converter/xmlbeans/springboot/XmlBeansDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-xmlbeans/src/main/java/org/apache/camel/converter/xmlbeans/springboot/XmlBeansDataFormatAutoConfiguration.java b/components/camel-xmlbeans/src/main/java/org/apache/camel/converter/xmlbeans/springboot/XmlBeansDataFormatAutoConfiguration.java
index 0ad298a..968a99c 100644
--- a/components/camel-xmlbeans/src/main/java/org/apache/camel/converter/xmlbeans/springboot/XmlBeansDataFormatAutoConfiguration.java
+++ b/components/camel-xmlbeans/src/main/java/org/apache/camel/converter/xmlbeans/springboot/XmlBeansDataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(XmlBeansDataFormatConfiguration.class)
public class XmlBeansDataFormatAutoConfiguration {
- @Bean
+ @Bean(name = "xmlBeans-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(XmlBeansDataFormat.class)
public XmlBeansDataFormat configureXmlBeansDataFormat(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-xmljson/src/main/java/org/apache/camel/dataformat/xmljson/springboot/XmlJsonDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-xmljson/src/main/java/org/apache/camel/dataformat/xmljson/springboot/XmlJsonDataFormatAutoConfiguration.java b/components/camel-xmljson/src/main/java/org/apache/camel/dataformat/xmljson/springboot/XmlJsonDataFormatAutoConfiguration.java
index 25af5a6..fc1c022 100644
--- a/components/camel-xmljson/src/main/java/org/apache/camel/dataformat/xmljson/springboot/XmlJsonDataFormatAutoConfiguration.java
+++ b/components/camel-xmljson/src/main/java/org/apache/camel/dataformat/xmljson/springboot/XmlJsonDataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(XmlJsonDataFormatConfiguration.class)
public class XmlJsonDataFormatAutoConfiguration {
- @Bean
+ @Bean(name = "xmljson-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(XmlJsonDataFormat.class)
public XmlJsonDataFormat configureXmlJsonDataFormat(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-xmlrpc/src/main/java/org/apache/camel/dataformat/xmlrpc/springboot/XmlRpcDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-xmlrpc/src/main/java/org/apache/camel/dataformat/xmlrpc/springboot/XmlRpcDataFormatAutoConfiguration.java b/components/camel-xmlrpc/src/main/java/org/apache/camel/dataformat/xmlrpc/springboot/XmlRpcDataFormatAutoConfiguration.java
index fd4462a..6130329 100644
--- a/components/camel-xmlrpc/src/main/java/org/apache/camel/dataformat/xmlrpc/springboot/XmlRpcDataFormatAutoConfiguration.java
+++ b/components/camel-xmlrpc/src/main/java/org/apache/camel/dataformat/xmlrpc/springboot/XmlRpcDataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(XmlRpcDataFormatConfiguration.class)
public class XmlRpcDataFormatAutoConfiguration {
- @Bean
+ @Bean(name = "xmlrpc-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(XmlRpcDataFormat.class)
public XmlRpcDataFormat configureXmlRpcDataFormat(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/springboot/XmlSignatureComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/springboot/XmlSignatureComponentAutoConfiguration.java b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/springboot/XmlSignatureComponentAutoConfiguration.java
index 702a20b..2e3c549 100644
--- a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/springboot/XmlSignatureComponentAutoConfiguration.java
+++ b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/springboot/XmlSignatureComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(XmlSignatureComponentConfiguration.class)
public class XmlSignatureComponentAutoConfiguration {
- @Bean
+ @Bean(name = "xmlsecurity-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(XmlSignatureComponent.class)
public XmlSignatureComponent configureXmlSignatureComponent(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/springboot/XMLSecurityDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/springboot/XMLSecurityDataFormatAutoConfiguration.java b/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/springboot/XMLSecurityDataFormatAutoConfiguration.java
index 5f192a0..c5e39fc 100644
--- a/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/springboot/XMLSecurityDataFormatAutoConfiguration.java
+++ b/components/camel-xmlsecurity/src/main/java/org/apache/camel/dataformat/xmlsecurity/springboot/XMLSecurityDataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(XMLSecurityDataFormatConfiguration.class)
public class XMLSecurityDataFormatAutoConfiguration {
- @Bean
+ @Bean(name = "secureXML-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(XMLSecurityDataFormat.class)
public XMLSecurityDataFormat configureXMLSecurityDataFormat(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/springboot/JsonDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/springboot/JsonDataFormatAutoConfiguration.java b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/springboot/JsonDataFormatAutoConfiguration.java
index 9b3ac59..69c7046 100644
--- a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/springboot/JsonDataFormatAutoConfiguration.java
+++ b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/springboot/JsonDataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(JsonDataFormatConfiguration.class)
public class JsonDataFormatAutoConfiguration {
- @Bean
+ @Bean(name = "json-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(JsonDataFormat.class)
public JsonDataFormat configureJsonDataFormat(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/springboot/XStreamDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/springboot/XStreamDataFormatAutoConfiguration.java b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/springboot/XStreamDataFormatAutoConfiguration.java
index 065a531..e93b205 100644
--- a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/springboot/XStreamDataFormatAutoConfiguration.java
+++ b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/springboot/XStreamDataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(XStreamDataFormatConfiguration.class)
public class XStreamDataFormatAutoConfiguration {
- @Bean
+ @Bean(name = "xstream-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(XStreamDataFormat.class)
public XStreamDataFormat configureXStreamDataFormat(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/springboot/YammerComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/springboot/YammerComponentAutoConfiguration.java b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/springboot/YammerComponentAutoConfiguration.java
index 9dbd9839..354e12b 100644
--- a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/springboot/YammerComponentAutoConfiguration.java
+++ b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/springboot/YammerComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(YammerComponentConfiguration.class)
public class YammerComponentAutoConfiguration {
- @Bean
+ @Bean(name = "yammer-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(YammerComponent.class)
public YammerComponent configureYammerComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatAutoConfiguration.java b/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatAutoConfiguration.java
index 5ebea8f..8871e47 100644
--- a/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatAutoConfiguration.java
+++ b/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/springboot/ZipFileDataFormatAutoConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(ZipFileDataFormatConfiguration.class)
public class ZipFileDataFormatAutoConfiguration {
- @Bean
+ @Bean(name = "zipFile-dataformat")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(ZipFileDataFormat.class)
public ZipFileDataFormat configureZipFileDataFormat(
http://git-wip-us.apache.org/repos/asf/camel/blob/68ad8caf/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/springboot/ZooKeeperComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/springboot/ZooKeeperComponentAutoConfiguration.java b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/springboot/ZooKeeperComponentAutoConfiguration.java
index d734f3b..705bc04 100644
--- a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/springboot/ZooKeeperComponentAutoConfiguration.java
+++ b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/springboot/ZooKeeperComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(ZooKeeperComponentConfiguration.class)
public class ZooKeeperComponentAutoConfiguration {
- @Bean
+ @Bean(name = "zookeeper-component")
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(ZooKeeperComponent.class)
public ZooKeeperComponent configureZooKeeperComponent(
[7/9] camel git commit: No more skipping components
Posted by da...@apache.org.
No more skipping components
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6154518a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6154518a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6154518a
Branch: refs/heads/master
Commit: 6154518a97522902f79e552d801731bf49fb12b4
Parents: 8d5fb02
Author: Nicola Ferraro <ni...@gmail.com>
Authored: Thu Jul 28 10:05:01 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jul 28 15:24:18 2016 +0200
----------------------------------------------------------------------
.../springboot/WsComponentAutoConfiguration.java | 2 +-
.../CometdComponentAutoConfiguration.java | 2 +-
.../HttpComponentAutoConfiguration.java | 2 +-
.../SmppComponentAutoConfiguration.java | 2 +-
.../SpringBootAutoConfigurationMojo.java | 18 ++++--------------
5 files changed, 8 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/6154518a/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/springboot/WsComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/springboot/WsComponentAutoConfiguration.java b/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/springboot/WsComponentAutoConfiguration.java
index 6617cb3..71e19bb 100644
--- a/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/springboot/WsComponentAutoConfiguration.java
+++ b/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/springboot/WsComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(WsComponentConfiguration.class)
public class WsComponentAutoConfiguration {
- @Bean(name = "ahc-ws-component")
+ @Bean(name = {"ahc-ws-component", "ahc-wss-component"})
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(WsComponent.class)
public WsComponent configureWsComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/6154518a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentAutoConfiguration.java b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentAutoConfiguration.java
index 2e58368..4d1a950 100644
--- a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentAutoConfiguration.java
+++ b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/springboot/CometdComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(CometdComponentConfiguration.class)
public class CometdComponentAutoConfiguration {
- @Bean(name = "cometd-component")
+ @Bean(name = {"cometds-component", "cometd-component"})
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(CometdComponent.class)
public CometdComponent configureCometdComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/6154518a/components/camel-http/src/main/java/org/apache/camel/component/http/springboot/HttpComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http/springboot/HttpComponentAutoConfiguration.java b/components/camel-http/src/main/java/org/apache/camel/component/http/springboot/HttpComponentAutoConfiguration.java
index 90b789e..b90977e 100644
--- a/components/camel-http/src/main/java/org/apache/camel/component/http/springboot/HttpComponentAutoConfiguration.java
+++ b/components/camel-http/src/main/java/org/apache/camel/component/http/springboot/HttpComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(HttpComponentConfiguration.class)
public class HttpComponentAutoConfiguration {
- @Bean(name = "http-component")
+ @Bean(name = {"http-component", "https-component"})
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(HttpComponent.class)
public HttpComponent configureHttpComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/6154518a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/springboot/SmppComponentAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/springboot/SmppComponentAutoConfiguration.java b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/springboot/SmppComponentAutoConfiguration.java
index 0e91188..d7e47e1 100644
--- a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/springboot/SmppComponentAutoConfiguration.java
+++ b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/springboot/SmppComponentAutoConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.context.annotation.Configuration;
@EnableConfigurationProperties(SmppComponentConfiguration.class)
public class SmppComponentAutoConfiguration {
- @Bean(name = "smpp-component")
+ @Bean(name = {"smpps-component", "smpp-component"})
@ConditionalOnClass(CamelContext.class)
@ConditionalOnMissingBean(SmppComponent.class)
public SmppComponent configureSmppComponent(CamelContext camelContext,
http://git-wip-us.apache.org/repos/asf/camel/blob/6154518a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
index 06ccde5..1008d1c 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
@@ -21,9 +21,7 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collections;
-import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
@@ -68,8 +66,6 @@ import static org.apache.camel.maven.packaging.PackageHelper.loadText;
*/
public class SpringBootAutoConfigurationMojo extends AbstractMojo {
- private static final String[] SKIP_COMPONENTS = new String[]{"ahc-wss", "cometds", "https", "http4s", "smpps", "solrs", "solrCloud"};
-
/**
* The maven project.
*
@@ -128,13 +124,6 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo {
List<ComponentModel> allModels = new LinkedList<>();
for (String componentName : componentNames) {
-
- // skip some components which is duplicates
- boolean skip = Arrays.asList(SKIP_COMPONENTS).contains(componentName);
- if (skip) {
- continue;
- }
-
String json = loadComponentJson(jsonFiles, componentName);
if (json != null) {
ComponentModel model = generateComponentModel(componentName, json);
@@ -144,7 +133,7 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo {
// Group the models by implementing classes
Map<String, List<ComponentModel>> grModels = allModels.stream().collect(Collectors.groupingBy(m -> m.getJavaType()));
- for(String componentClass : grModels.keySet()) {
+ for (String componentClass : grModels.keySet()) {
List<ComponentModel> compModels = grModels.get(componentClass);
ComponentModel model = compModels.get(0); // They should be equivalent
List<String> aliases = compModels.stream().map(m -> m.getScheme()).collect(Collectors.toList());
@@ -158,7 +147,7 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo {
String pkg = model.getJavaType().substring(0, pos) + ".springboot";
String overrideComponentName = null;
- if(aliases.size()>1) {
+ if (aliases.size() > 1) {
// determine component name when there are multiple ones
overrideComponentName = model.getArtifactId().replace("camel-", "");
}
@@ -502,7 +491,8 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo {
method.addParameter(configurationName, "configuration");
// adding the '-dataformat' suffix to prevent collision with component names
- method.addAnnotation(Bean.class).setStringValue("name", model.getModelName() + "-dataformat");;
+ method.addAnnotation(Bean.class).setStringValue("name", model.getModelName() + "-dataformat");
+ ;
method.addAnnotation(ConditionalOnClass.class).setLiteralValue("value", "CamelContext.class");
method.addAnnotation(ConditionalOnMissingBean.class).setLiteralValue("value", model.getShortJavaType() + ".class");