Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id ED89F200BD3 for ; Tue, 6 Dec 2016 17:09:02 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id EA710160B1B; Tue, 6 Dec 2016 16:09:02 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 2369A160B35 for ; Tue, 6 Dec 2016 17:08:59 +0100 (CET) Received: (qmail 7044 invoked by uid 500); 6 Dec 2016 16:08:59 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 6469 invoked by uid 99); 6 Dec 2016 16:08:58 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Dec 2016 16:08:58 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C00EFF2139; Tue, 6 Dec 2016 16:08:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: lburgazzoli@apache.org To: commits@camel.apache.org Date: Tue, 06 Dec 2016 16:09:09 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [12/15] camel git commit: CAMEL-10551: spring-boot: make auto configured dataformats and languages prototype archived-at: Tue, 06 Dec 2016 16:09:03 -0000 CAMEL-10551: spring-boot: make auto configured dataformats and languages prototype (cherry picked from commit 16a744317692bfac4c8fb3fce48d3f2cd0f91bbc) Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9ce3d180 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9ce3d180 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9ce3d180 Branch: refs/heads/camel-2.18.x Commit: 9ce3d18015afd7143b403b505f2ecd8ccbdf6537 Parents: 2f9a99c Author: lburgazzoli Authored: Tue Dec 6 16:25:04 2016 +0100 Committer: lburgazzoli Committed: Tue Dec 6 16:25:04 2016 +0100 ---------------------------------------------------------------------- .../avro/springboot/AvroDataFormatAutoConfiguration.java | 2 ++ .../barcode/springboot/BarcodeDataFormatAutoConfiguration.java | 2 ++ .../base64/springboot/Base64DataFormatAutoConfiguration.java | 2 ++ .../beanio/springboot/BeanIODataFormatAutoConfiguration.java | 2 ++ .../bindy/csv/springboot/BindyCsvDataFormatAutoConfiguration.java | 2 ++ .../springboot/BindyFixedLengthDataFormatAutoConfiguration.java | 2 ++ .../springboot/BindyKeyValuePairDataFormatAutoConfiguration.java | 2 ++ .../boon/springboot/BoonDataFormatAutoConfiguration.java | 2 ++ .../castor/springboot/CastorDataFormatAutoConfiguration.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 ++ .../language/bean/springboot/BeanLanguageAutoConfiguration.java | 2 ++ .../constant/springboot/ConstantLanguageAutoConfiguration.java | 2 ++ .../header/springboot/HeaderLanguageAutoConfiguration.java | 2 ++ .../springboot/ExchangePropertyLanguageAutoConfiguration.java | 2 ++ .../language/ref/springboot/RefLanguageAutoConfiguration.java | 2 ++ .../language/simple/springboot/FileLanguageAutoConfiguration.java | 2 ++ .../simple/springboot/SimpleLanguageAutoConfiguration.java | 2 ++ .../tokenizer/springboot/TokenizeLanguageAutoConfiguration.java | 2 ++ .../springboot/XMLTokenizeLanguageAutoConfiguration.java | 2 ++ .../language/xpath/springboot/XPathLanguageAutoConfiguration.java | 2 ++ .../crypto/springboot/CryptoDataFormatAutoConfiguration.java | 2 ++ .../crypto/springboot/PGPDataFormatAutoConfiguration.java | 2 ++ .../dataformat/csv/springboot/CsvDataFormatAutoConfiguration.java | 2 ++ .../flatpack/springboot/FlatpackDataFormatAutoConfiguration.java | 2 ++ .../groovy/springboot/GroovyLanguageAutoConfiguration.java | 2 ++ .../gson/springboot/GsonDataFormatAutoConfiguration.java | 2 ++ .../hessian/springboot/HessianDataFormatAutoConfiguration.java | 2 ++ .../component/hl7/springboot/HL7DataFormatAutoConfiguration.java | 2 ++ .../component/hl7/springboot/TerserLanguageAutoConfiguration.java | 2 ++ .../ical/springboot/ICalDataFormatAutoConfiguration.java | 2 ++ .../jackson/springboot/JacksonDataFormatAutoConfiguration.java | 2 ++ .../springboot/JacksonXMLDataFormatAutoConfiguration.java | 2 ++ .../jaxb/springboot/JaxbDataFormatAutoConfiguration.java | 2 ++ .../jibx/springboot/JibxDataFormatAutoConfiguration.java | 2 ++ .../johnzon/springboot/JohnzonDataFormatAutoConfiguration.java | 2 ++ .../language/sql/springboot/SqlLanguageAutoConfiguration.java | 2 ++ .../jsonpath/springboot/JsonPathLanguageAutoConfiguration.java | 2 ++ .../language/juel/springboot/JuelLanguageAutoConfiguration.java | 2 ++ .../jxpath/springboot/JXPathLanguageAutoConfiguration.java | 2 ++ .../dataformat/lzf/springboot/LZFDataFormatAutoConfiguration.java | 2 ++ .../springboot/MimeMultipartDataFormatAutoConfiguration.java | 2 ++ .../language/mvel/springboot/MvelLanguageAutoConfiguration.java | 2 ++ .../language/ognl/springboot/OgnlLanguageAutoConfiguration.java | 2 ++ .../protobuf/springboot/ProtobufDataFormatAutoConfiguration.java | 2 ++ .../dataformat/rss/springboot/RssDataFormatAutoConfiguration.java | 2 ++ .../xquery/springboot/XQueryLanguageAutoConfiguration.java | 2 ++ .../script/springboot/JavaScriptLanguageAutoConfiguration.java | 2 ++ .../builder/script/springboot/PhpLanguageAutoConfiguration.java | 2 ++ .../script/springboot/PythonLanguageAutoConfiguration.java | 2 ++ .../builder/script/springboot/RubyLanguageAutoConfiguration.java | 2 ++ .../springboot/SnakeYAMLDataFormatAutoConfiguration.java | 2 ++ .../soap/springboot/SoapJaxbDataFormatAutoConfiguration.java | 2 ++ .../language/spel/springboot/SpelLanguageAutoConfiguration.java | 2 ++ .../syslog/springboot/SyslogDataFormatAutoConfiguration.java | 2 ++ .../tagsoup/springboot/TidyMarkupDataFormatAutoConfiguration.java | 2 ++ .../tarfile/springboot/TarFileDataFormatAutoConfiguration.java | 2 ++ .../springboot/UniVocityCsvDataFormatAutoConfiguration.java | 2 ++ .../UniVocityFixedWidthDataFormatAutoConfiguration.java | 2 ++ .../springboot/UniVocityTsvDataFormatAutoConfiguration.java | 2 ++ .../xmlbeans/springboot/XmlBeansDataFormatAutoConfiguration.java | 2 ++ .../xmljson/springboot/XmlJsonDataFormatAutoConfiguration.java | 2 ++ .../xmlrpc/springboot/XmlRpcDataFormatAutoConfiguration.java | 2 ++ .../springboot/XMLSecurityDataFormatAutoConfiguration.java | 2 ++ .../xstream/springboot/JsonDataFormatAutoConfiguration.java | 2 ++ .../xstream/springboot/XStreamDataFormatAutoConfiguration.java | 2 ++ .../zipfile/springboot/ZipFileDataFormatAutoConfiguration.java | 2 ++ .../camel/maven/packaging/SpringBootAutoConfigurationMojo.java | 3 +++ 70 files changed, 141 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/9ce3d180/components-starter/camel-avro-starter/src/main/java/org/apache/camel/dataformat/avro/springboot/AvroDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-avro-starter/src/main/java/org/apache/camel/dataformat/avro/springboot/AvroDataFormatAutoConfiguration.java b/components-starter/camel-avro-starter/src/main/java/org/apache/camel/dataformat/avro/springboot/AvroDataFormatAutoConfiguration.java index b34249e..97e0c19 100644 --- a/components-starter/camel-avro-starter/src/main/java/org/apache/camel/dataformat/avro/springboot/AvroDataFormatAutoConfiguration.java +++ b/components-starter/camel-avro-starter/src/main/java/org/apache/camel/dataformat/avro/springboot/AvroDataFormatAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -44,6 +45,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class AvroDataFormatAutoConfiguration { @Bean(name = "avro-dataformat") + @Scope("prototype") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(AvroDataFormat.class) public AvroDataFormat configureAvroDataFormat(CamelContext camelContext, http://git-wip-us.apache.org/repos/asf/camel/blob/9ce3d180/components-starter/camel-barcode-starter/src/main/java/org/apache/camel/dataformat/barcode/springboot/BarcodeDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-barcode-starter/src/main/java/org/apache/camel/dataformat/barcode/springboot/BarcodeDataFormatAutoConfiguration.java b/components-starter/camel-barcode-starter/src/main/java/org/apache/camel/dataformat/barcode/springboot/BarcodeDataFormatAutoConfiguration.java index 3cb528f..728808a 100644 --- a/components-starter/camel-barcode-starter/src/main/java/org/apache/camel/dataformat/barcode/springboot/BarcodeDataFormatAutoConfiguration.java +++ b/components-starter/camel-barcode-starter/src/main/java/org/apache/camel/dataformat/barcode/springboot/BarcodeDataFormatAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -44,6 +45,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class BarcodeDataFormatAutoConfiguration { @Bean(name = "barcode-dataformat") + @Scope("prototype") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(BarcodeDataFormat.class) public BarcodeDataFormat configureBarcodeDataFormat( http://git-wip-us.apache.org/repos/asf/camel/blob/9ce3d180/components-starter/camel-base64-starter/src/main/java/org/apache/camel/dataformat/base64/springboot/Base64DataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-base64-starter/src/main/java/org/apache/camel/dataformat/base64/springboot/Base64DataFormatAutoConfiguration.java b/components-starter/camel-base64-starter/src/main/java/org/apache/camel/dataformat/base64/springboot/Base64DataFormatAutoConfiguration.java index 8b1639c..2b9e336 100644 --- a/components-starter/camel-base64-starter/src/main/java/org/apache/camel/dataformat/base64/springboot/Base64DataFormatAutoConfiguration.java +++ b/components-starter/camel-base64-starter/src/main/java/org/apache/camel/dataformat/base64/springboot/Base64DataFormatAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -44,6 +45,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class Base64DataFormatAutoConfiguration { @Bean(name = "base64-dataformat") + @Scope("prototype") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(Base64DataFormat.class) public Base64DataFormat configureBase64DataFormat( http://git-wip-us.apache.org/repos/asf/camel/blob/9ce3d180/components-starter/camel-beanio-starter/src/main/java/org/apache/camel/dataformat/beanio/springboot/BeanIODataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-beanio-starter/src/main/java/org/apache/camel/dataformat/beanio/springboot/BeanIODataFormatAutoConfiguration.java b/components-starter/camel-beanio-starter/src/main/java/org/apache/camel/dataformat/beanio/springboot/BeanIODataFormatAutoConfiguration.java index b65aa7c..93be379 100644 --- a/components-starter/camel-beanio-starter/src/main/java/org/apache/camel/dataformat/beanio/springboot/BeanIODataFormatAutoConfiguration.java +++ b/components-starter/camel-beanio-starter/src/main/java/org/apache/camel/dataformat/beanio/springboot/BeanIODataFormatAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -44,6 +45,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class BeanIODataFormatAutoConfiguration { @Bean(name = "beanio-dataformat") + @Scope("prototype") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(BeanIODataFormat.class) public BeanIODataFormat configureBeanIODataFormat( http://git-wip-us.apache.org/repos/asf/camel/blob/9ce3d180/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/csv/springboot/BindyCsvDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/csv/springboot/BindyCsvDataFormatAutoConfiguration.java b/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/csv/springboot/BindyCsvDataFormatAutoConfiguration.java index e02c0d3..7e3a35d 100644 --- a/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/csv/springboot/BindyCsvDataFormatAutoConfiguration.java +++ b/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/csv/springboot/BindyCsvDataFormatAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -44,6 +45,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class BindyCsvDataFormatAutoConfiguration { @Bean(name = "bindy-csv-dataformat") + @Scope("prototype") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(BindyCsvDataFormat.class) public BindyCsvDataFormat configureBindyCsvDataFormat( http://git-wip-us.apache.org/repos/asf/camel/blob/9ce3d180/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/fixed/springboot/BindyFixedLengthDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/fixed/springboot/BindyFixedLengthDataFormatAutoConfiguration.java b/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/fixed/springboot/BindyFixedLengthDataFormatAutoConfiguration.java index 4f977a8..35059f2 100644 --- a/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/fixed/springboot/BindyFixedLengthDataFormatAutoConfiguration.java +++ b/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/fixed/springboot/BindyFixedLengthDataFormatAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -44,6 +45,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class BindyFixedLengthDataFormatAutoConfiguration { @Bean(name = "bindy-fixed-dataformat") + @Scope("prototype") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(BindyFixedLengthDataFormat.class) public BindyFixedLengthDataFormat configureBindyFixedLengthDataFormat( http://git-wip-us.apache.org/repos/asf/camel/blob/9ce3d180/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/kvp/springboot/BindyKeyValuePairDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/kvp/springboot/BindyKeyValuePairDataFormatAutoConfiguration.java b/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/kvp/springboot/BindyKeyValuePairDataFormatAutoConfiguration.java index f1d1fad..75c893a 100644 --- a/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/kvp/springboot/BindyKeyValuePairDataFormatAutoConfiguration.java +++ b/components-starter/camel-bindy-starter/src/main/java/org/apache/camel/dataformat/bindy/kvp/springboot/BindyKeyValuePairDataFormatAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -44,6 +45,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class BindyKeyValuePairDataFormatAutoConfiguration { @Bean(name = "bindy-kvp-dataformat") + @Scope("prototype") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(BindyKeyValuePairDataFormat.class) public BindyKeyValuePairDataFormat configureBindyKeyValuePairDataFormat( http://git-wip-us.apache.org/repos/asf/camel/blob/9ce3d180/components-starter/camel-boon-starter/src/main/java/org/apache/camel/component/boon/springboot/BoonDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-boon-starter/src/main/java/org/apache/camel/component/boon/springboot/BoonDataFormatAutoConfiguration.java b/components-starter/camel-boon-starter/src/main/java/org/apache/camel/component/boon/springboot/BoonDataFormatAutoConfiguration.java index 92e449b..4a6ba47 100644 --- a/components-starter/camel-boon-starter/src/main/java/org/apache/camel/component/boon/springboot/BoonDataFormatAutoConfiguration.java +++ b/components-starter/camel-boon-starter/src/main/java/org/apache/camel/component/boon/springboot/BoonDataFormatAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -44,6 +45,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class BoonDataFormatAutoConfiguration { @Bean(name = "boon-dataformat") + @Scope("prototype") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(BoonDataFormat.class) public BoonDataFormat configureBoonDataFormat(CamelContext camelContext, http://git-wip-us.apache.org/repos/asf/camel/blob/9ce3d180/components-starter/camel-castor-starter/src/main/java/org/apache/camel/dataformat/castor/springboot/CastorDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-castor-starter/src/main/java/org/apache/camel/dataformat/castor/springboot/CastorDataFormatAutoConfiguration.java b/components-starter/camel-castor-starter/src/main/java/org/apache/camel/dataformat/castor/springboot/CastorDataFormatAutoConfiguration.java index 311f1fd..64fde4f 100644 --- a/components-starter/camel-castor-starter/src/main/java/org/apache/camel/dataformat/castor/springboot/CastorDataFormatAutoConfiguration.java +++ b/components-starter/camel-castor-starter/src/main/java/org/apache/camel/dataformat/castor/springboot/CastorDataFormatAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -44,6 +45,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class CastorDataFormatAutoConfiguration { @Bean(name = "castor-dataformat") + @Scope("prototype") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(CastorDataFormat.class) public CastorDataFormat configureCastorDataFormat( http://git-wip-us.apache.org/repos/asf/camel/blob/9ce3d180/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/GzipDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/GzipDataFormatAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/GzipDataFormatAutoConfiguration.java index 828a263..495f5e0 100644 --- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/GzipDataFormatAutoConfiguration.java +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/GzipDataFormatAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -44,6 +45,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class GzipDataFormatAutoConfiguration { @Bean(name = "gzip-dataformat") + @Scope("prototype") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(GzipDataFormat.class) public GzipDataFormat configureGzipDataFormat(CamelContext camelContext, http://git-wip-us.apache.org/repos/asf/camel/blob/9ce3d180/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/SerializationDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/SerializationDataFormatAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/SerializationDataFormatAutoConfiguration.java index 3481aed..c1fb1d7 100644 --- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/SerializationDataFormatAutoConfiguration.java +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/SerializationDataFormatAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -44,6 +45,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class SerializationDataFormatAutoConfiguration { @Bean(name = "serialization-dataformat") + @Scope("prototype") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(SerializationDataFormat.class) public SerializationDataFormat configureSerializationDataFormat( http://git-wip-us.apache.org/repos/asf/camel/blob/9ce3d180/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/StringDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/StringDataFormatAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/StringDataFormatAutoConfiguration.java index f0d9e1a..27d8b8e 100644 --- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/StringDataFormatAutoConfiguration.java +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/StringDataFormatAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -44,6 +45,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class StringDataFormatAutoConfiguration { @Bean(name = "string-dataformat") + @Scope("prototype") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(StringDataFormat.class) public StringDataFormat configureStringDataFormat( http://git-wip-us.apache.org/repos/asf/camel/blob/9ce3d180/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/ZipDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/ZipDataFormatAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/ZipDataFormatAutoConfiguration.java index 4f2ce8f..d35e906 100644 --- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/ZipDataFormatAutoConfiguration.java +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/ZipDataFormatAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -44,6 +45,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class ZipDataFormatAutoConfiguration { @Bean(name = "zip-dataformat") + @Scope("prototype") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(ZipDataFormat.class) public ZipDataFormat configureZipDataFormat(CamelContext camelContext, http://git-wip-us.apache.org/repos/asf/camel/blob/9ce3d180/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/bean/springboot/BeanLanguageAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/bean/springboot/BeanLanguageAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/bean/springboot/BeanLanguageAutoConfiguration.java index b71f03d..34f0c54 100644 --- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/bean/springboot/BeanLanguageAutoConfiguration.java +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/bean/springboot/BeanLanguageAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -44,6 +45,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class BeanLanguageAutoConfiguration { @Bean(name = "bean-language") + @Scope("prototype") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(BeanLanguage.class) public BeanLanguage configureBeanLanguage(CamelContext camelContext, http://git-wip-us.apache.org/repos/asf/camel/blob/9ce3d180/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/constant/springboot/ConstantLanguageAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/constant/springboot/ConstantLanguageAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/constant/springboot/ConstantLanguageAutoConfiguration.java index b9d25a2..1ea4587 100644 --- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/constant/springboot/ConstantLanguageAutoConfiguration.java +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/constant/springboot/ConstantLanguageAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -44,6 +45,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class ConstantLanguageAutoConfiguration { @Bean(name = "constant-language") + @Scope("prototype") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(ConstantLanguage.class) public ConstantLanguage configureConstantLanguage( http://git-wip-us.apache.org/repos/asf/camel/blob/9ce3d180/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/header/springboot/HeaderLanguageAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/header/springboot/HeaderLanguageAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/header/springboot/HeaderLanguageAutoConfiguration.java index 436636f..e2e98fc 100644 --- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/header/springboot/HeaderLanguageAutoConfiguration.java +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/header/springboot/HeaderLanguageAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -44,6 +45,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class HeaderLanguageAutoConfiguration { @Bean(name = "header-language") + @Scope("prototype") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(HeaderLanguage.class) public HeaderLanguage configureHeaderLanguage(CamelContext camelContext, http://git-wip-us.apache.org/repos/asf/camel/blob/9ce3d180/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/property/springboot/ExchangePropertyLanguageAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/property/springboot/ExchangePropertyLanguageAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/property/springboot/ExchangePropertyLanguageAutoConfiguration.java index fd2393a..a832384 100644 --- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/property/springboot/ExchangePropertyLanguageAutoConfiguration.java +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/property/springboot/ExchangePropertyLanguageAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -44,6 +45,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class ExchangePropertyLanguageAutoConfiguration { @Bean(name = "exchangeProperty-language") + @Scope("prototype") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(ExchangePropertyLanguage.class) public ExchangePropertyLanguage configureExchangePropertyLanguage( http://git-wip-us.apache.org/repos/asf/camel/blob/9ce3d180/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/ref/springboot/RefLanguageAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/ref/springboot/RefLanguageAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/ref/springboot/RefLanguageAutoConfiguration.java index e81adac..3ccdbba 100644 --- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/ref/springboot/RefLanguageAutoConfiguration.java +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/ref/springboot/RefLanguageAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -44,6 +45,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class RefLanguageAutoConfiguration { @Bean(name = "ref-language") + @Scope("prototype") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(RefLanguage.class) public RefLanguage configureRefLanguage(CamelContext camelContext, http://git-wip-us.apache.org/repos/asf/camel/blob/9ce3d180/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/simple/springboot/FileLanguageAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/simple/springboot/FileLanguageAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/simple/springboot/FileLanguageAutoConfiguration.java index b27ffd7..43723f6 100644 --- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/simple/springboot/FileLanguageAutoConfiguration.java +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/simple/springboot/FileLanguageAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -44,6 +45,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class FileLanguageAutoConfiguration { @Bean(name = "file-language") + @Scope("prototype") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(FileLanguage.class) public FileLanguage configureFileLanguage(CamelContext camelContext, http://git-wip-us.apache.org/repos/asf/camel/blob/9ce3d180/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/simple/springboot/SimpleLanguageAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/simple/springboot/SimpleLanguageAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/simple/springboot/SimpleLanguageAutoConfiguration.java index bb10195..6d8b8b2 100644 --- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/simple/springboot/SimpleLanguageAutoConfiguration.java +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/simple/springboot/SimpleLanguageAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -44,6 +45,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class SimpleLanguageAutoConfiguration { @Bean(name = "simple-language") + @Scope("prototype") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(SimpleLanguage.class) public SimpleLanguage configureSimpleLanguage(CamelContext camelContext, http://git-wip-us.apache.org/repos/asf/camel/blob/9ce3d180/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/tokenizer/springboot/TokenizeLanguageAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/tokenizer/springboot/TokenizeLanguageAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/tokenizer/springboot/TokenizeLanguageAutoConfiguration.java index c470b8c..6fd7569 100644 --- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/tokenizer/springboot/TokenizeLanguageAutoConfiguration.java +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/tokenizer/springboot/TokenizeLanguageAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -44,6 +45,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class TokenizeLanguageAutoConfiguration { @Bean(name = "tokenize-language") + @Scope("prototype") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(TokenizeLanguage.class) public TokenizeLanguage configureTokenizeLanguage( http://git-wip-us.apache.org/repos/asf/camel/blob/9ce3d180/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/tokenizer/springboot/XMLTokenizeLanguageAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/tokenizer/springboot/XMLTokenizeLanguageAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/tokenizer/springboot/XMLTokenizeLanguageAutoConfiguration.java index 149019d..172f15b 100644 --- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/tokenizer/springboot/XMLTokenizeLanguageAutoConfiguration.java +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/tokenizer/springboot/XMLTokenizeLanguageAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -44,6 +45,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class XMLTokenizeLanguageAutoConfiguration { @Bean(name = "xtokenize-language") + @Scope("prototype") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(XMLTokenizeLanguage.class) public XMLTokenizeLanguage configureXMLTokenizeLanguage( http://git-wip-us.apache.org/repos/asf/camel/blob/9ce3d180/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/xpath/springboot/XPathLanguageAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/xpath/springboot/XPathLanguageAutoConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/xpath/springboot/XPathLanguageAutoConfiguration.java index 2589dc4..9635746 100644 --- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/xpath/springboot/XPathLanguageAutoConfiguration.java +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/xpath/springboot/XPathLanguageAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -44,6 +45,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class XPathLanguageAutoConfiguration { @Bean(name = "xpath-language") + @Scope("prototype") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(XPathLanguage.class) public XPathLanguage configureXPathLanguage(CamelContext camelContext, http://git-wip-us.apache.org/repos/asf/camel/blob/9ce3d180/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/converter/crypto/springboot/CryptoDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/converter/crypto/springboot/CryptoDataFormatAutoConfiguration.java b/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/converter/crypto/springboot/CryptoDataFormatAutoConfiguration.java index 10d466e..e14f686 100644 --- a/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/converter/crypto/springboot/CryptoDataFormatAutoConfiguration.java +++ b/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/converter/crypto/springboot/CryptoDataFormatAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -44,6 +45,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class CryptoDataFormatAutoConfiguration { @Bean(name = "crypto-dataformat") + @Scope("prototype") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(CryptoDataFormat.class) public CryptoDataFormat configureCryptoDataFormat( http://git-wip-us.apache.org/repos/asf/camel/blob/9ce3d180/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/converter/crypto/springboot/PGPDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/converter/crypto/springboot/PGPDataFormatAutoConfiguration.java b/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/converter/crypto/springboot/PGPDataFormatAutoConfiguration.java index c1f2174..8216411 100644 --- a/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/converter/crypto/springboot/PGPDataFormatAutoConfiguration.java +++ b/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/converter/crypto/springboot/PGPDataFormatAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -44,6 +45,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class PGPDataFormatAutoConfiguration { @Bean(name = "pgp-dataformat") + @Scope("prototype") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(PGPDataFormat.class) public PGPDataFormat configurePGPDataFormat(CamelContext camelContext, http://git-wip-us.apache.org/repos/asf/camel/blob/9ce3d180/components-starter/camel-csv-starter/src/main/java/org/apache/camel/dataformat/csv/springboot/CsvDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-csv-starter/src/main/java/org/apache/camel/dataformat/csv/springboot/CsvDataFormatAutoConfiguration.java b/components-starter/camel-csv-starter/src/main/java/org/apache/camel/dataformat/csv/springboot/CsvDataFormatAutoConfiguration.java index 45b2793..2016232 100644 --- a/components-starter/camel-csv-starter/src/main/java/org/apache/camel/dataformat/csv/springboot/CsvDataFormatAutoConfiguration.java +++ b/components-starter/camel-csv-starter/src/main/java/org/apache/camel/dataformat/csv/springboot/CsvDataFormatAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -44,6 +45,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class CsvDataFormatAutoConfiguration { @Bean(name = "csv-dataformat") + @Scope("prototype") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(CsvDataFormat.class) public CsvDataFormat configureCsvDataFormat(CamelContext camelContext, http://git-wip-us.apache.org/repos/asf/camel/blob/9ce3d180/components-starter/camel-flatpack-starter/src/main/java/org/apache/camel/dataformat/flatpack/springboot/FlatpackDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-flatpack-starter/src/main/java/org/apache/camel/dataformat/flatpack/springboot/FlatpackDataFormatAutoConfiguration.java b/components-starter/camel-flatpack-starter/src/main/java/org/apache/camel/dataformat/flatpack/springboot/FlatpackDataFormatAutoConfiguration.java index 446f3c7..f21adce 100644 --- a/components-starter/camel-flatpack-starter/src/main/java/org/apache/camel/dataformat/flatpack/springboot/FlatpackDataFormatAutoConfiguration.java +++ b/components-starter/camel-flatpack-starter/src/main/java/org/apache/camel/dataformat/flatpack/springboot/FlatpackDataFormatAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -44,6 +45,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class FlatpackDataFormatAutoConfiguration { @Bean(name = "flatpack-dataformat") + @Scope("prototype") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(FlatpackDataFormat.class) public FlatpackDataFormat configureFlatpackDataFormat( http://git-wip-us.apache.org/repos/asf/camel/blob/9ce3d180/components-starter/camel-groovy-starter/src/main/java/org/apache/camel/language/groovy/springboot/GroovyLanguageAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-groovy-starter/src/main/java/org/apache/camel/language/groovy/springboot/GroovyLanguageAutoConfiguration.java b/components-starter/camel-groovy-starter/src/main/java/org/apache/camel/language/groovy/springboot/GroovyLanguageAutoConfiguration.java index 40a635c..f81169f 100644 --- a/components-starter/camel-groovy-starter/src/main/java/org/apache/camel/language/groovy/springboot/GroovyLanguageAutoConfiguration.java +++ b/components-starter/camel-groovy-starter/src/main/java/org/apache/camel/language/groovy/springboot/GroovyLanguageAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -44,6 +45,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class GroovyLanguageAutoConfiguration { @Bean(name = "groovy-language") + @Scope("prototype") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(GroovyLanguage.class) public GroovyLanguage configureGroovyLanguage(CamelContext camelContext, http://git-wip-us.apache.org/repos/asf/camel/blob/9ce3d180/components-starter/camel-gson-starter/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-gson-starter/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatAutoConfiguration.java b/components-starter/camel-gson-starter/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatAutoConfiguration.java index 184074b..bc26db0 100644 --- a/components-starter/camel-gson-starter/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatAutoConfiguration.java +++ b/components-starter/camel-gson-starter/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -44,6 +45,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class GsonDataFormatAutoConfiguration { @Bean(name = "json-gson-dataformat") + @Scope("prototype") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(GsonDataFormat.class) public GsonDataFormat configureGsonDataFormat(CamelContext camelContext, http://git-wip-us.apache.org/repos/asf/camel/blob/9ce3d180/components-starter/camel-hessian-starter/src/main/java/org/apache/camel/dataformat/hessian/springboot/HessianDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-hessian-starter/src/main/java/org/apache/camel/dataformat/hessian/springboot/HessianDataFormatAutoConfiguration.java b/components-starter/camel-hessian-starter/src/main/java/org/apache/camel/dataformat/hessian/springboot/HessianDataFormatAutoConfiguration.java index 258d406..6883523 100644 --- a/components-starter/camel-hessian-starter/src/main/java/org/apache/camel/dataformat/hessian/springboot/HessianDataFormatAutoConfiguration.java +++ b/components-starter/camel-hessian-starter/src/main/java/org/apache/camel/dataformat/hessian/springboot/HessianDataFormatAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -44,6 +45,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class HessianDataFormatAutoConfiguration { @Bean(name = "hessian-dataformat") + @Scope("prototype") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(HessianDataFormat.class) public HessianDataFormat configureHessianDataFormat( http://git-wip-us.apache.org/repos/asf/camel/blob/9ce3d180/components-starter/camel-hl7-starter/src/main/java/org/apache/camel/component/hl7/springboot/HL7DataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-hl7-starter/src/main/java/org/apache/camel/component/hl7/springboot/HL7DataFormatAutoConfiguration.java b/components-starter/camel-hl7-starter/src/main/java/org/apache/camel/component/hl7/springboot/HL7DataFormatAutoConfiguration.java index 634b59a..e23c4ad 100644 --- a/components-starter/camel-hl7-starter/src/main/java/org/apache/camel/component/hl7/springboot/HL7DataFormatAutoConfiguration.java +++ b/components-starter/camel-hl7-starter/src/main/java/org/apache/camel/component/hl7/springboot/HL7DataFormatAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -44,6 +45,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class HL7DataFormatAutoConfiguration { @Bean(name = "hl7-dataformat") + @Scope("prototype") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(HL7DataFormat.class) public HL7DataFormat configureHL7DataFormat(CamelContext camelContext, http://git-wip-us.apache.org/repos/asf/camel/blob/9ce3d180/components-starter/camel-hl7-starter/src/main/java/org/apache/camel/component/hl7/springboot/TerserLanguageAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-hl7-starter/src/main/java/org/apache/camel/component/hl7/springboot/TerserLanguageAutoConfiguration.java b/components-starter/camel-hl7-starter/src/main/java/org/apache/camel/component/hl7/springboot/TerserLanguageAutoConfiguration.java index a3e80bd..7f68461 100644 --- a/components-starter/camel-hl7-starter/src/main/java/org/apache/camel/component/hl7/springboot/TerserLanguageAutoConfiguration.java +++ b/components-starter/camel-hl7-starter/src/main/java/org/apache/camel/component/hl7/springboot/TerserLanguageAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -44,6 +45,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class TerserLanguageAutoConfiguration { @Bean(name = "terser-language") + @Scope("prototype") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(TerserLanguage.class) public TerserLanguage configureTerserLanguage(CamelContext camelContext, http://git-wip-us.apache.org/repos/asf/camel/blob/9ce3d180/components-starter/camel-ical-starter/src/main/java/org/apache/camel/component/ical/springboot/ICalDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-ical-starter/src/main/java/org/apache/camel/component/ical/springboot/ICalDataFormatAutoConfiguration.java b/components-starter/camel-ical-starter/src/main/java/org/apache/camel/component/ical/springboot/ICalDataFormatAutoConfiguration.java index a0795a1..7efcaec 100644 --- a/components-starter/camel-ical-starter/src/main/java/org/apache/camel/component/ical/springboot/ICalDataFormatAutoConfiguration.java +++ b/components-starter/camel-ical-starter/src/main/java/org/apache/camel/component/ical/springboot/ICalDataFormatAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -44,6 +45,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class ICalDataFormatAutoConfiguration { @Bean(name = "ical-dataformat") + @Scope("prototype") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(ICalDataFormat.class) public ICalDataFormat configureICalDataFormat(CamelContext camelContext, http://git-wip-us.apache.org/repos/asf/camel/blob/9ce3d180/components-starter/camel-jackson-starter/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-jackson-starter/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatAutoConfiguration.java b/components-starter/camel-jackson-starter/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatAutoConfiguration.java index 90b0cad..f7bc171 100644 --- a/components-starter/camel-jackson-starter/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatAutoConfiguration.java +++ b/components-starter/camel-jackson-starter/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -44,6 +45,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class JacksonDataFormatAutoConfiguration { @Bean(name = "json-jackson-dataformat") + @Scope("prototype") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(JacksonDataFormat.class) public JacksonDataFormat configureJacksonDataFormat( http://git-wip-us.apache.org/repos/asf/camel/blob/9ce3d180/components-starter/camel-jacksonxml-starter/src/main/java/org/apache/camel/component/jacksonxml/springboot/JacksonXMLDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-jacksonxml-starter/src/main/java/org/apache/camel/component/jacksonxml/springboot/JacksonXMLDataFormatAutoConfiguration.java b/components-starter/camel-jacksonxml-starter/src/main/java/org/apache/camel/component/jacksonxml/springboot/JacksonXMLDataFormatAutoConfiguration.java index e09a8c3..7ea8bea 100644 --- a/components-starter/camel-jacksonxml-starter/src/main/java/org/apache/camel/component/jacksonxml/springboot/JacksonXMLDataFormatAutoConfiguration.java +++ b/components-starter/camel-jacksonxml-starter/src/main/java/org/apache/camel/component/jacksonxml/springboot/JacksonXMLDataFormatAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -44,6 +45,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class JacksonXMLDataFormatAutoConfiguration { @Bean(name = "jacksonxml-dataformat") + @Scope("prototype") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(JacksonXMLDataFormat.class) public JacksonXMLDataFormat configureJacksonXMLDataFormat( http://git-wip-us.apache.org/repos/asf/camel/blob/9ce3d180/components-starter/camel-jaxb-starter/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-jaxb-starter/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatAutoConfiguration.java b/components-starter/camel-jaxb-starter/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatAutoConfiguration.java index ddc030a..eb3962b 100644 --- a/components-starter/camel-jaxb-starter/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatAutoConfiguration.java +++ b/components-starter/camel-jaxb-starter/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -44,6 +45,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class JaxbDataFormatAutoConfiguration { @Bean(name = "jaxb-dataformat") + @Scope("prototype") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(JaxbDataFormat.class) public JaxbDataFormat configureJaxbDataFormat(CamelContext camelContext, http://git-wip-us.apache.org/repos/asf/camel/blob/9ce3d180/components-starter/camel-jibx-starter/src/main/java/org/apache/camel/dataformat/jibx/springboot/JibxDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-jibx-starter/src/main/java/org/apache/camel/dataformat/jibx/springboot/JibxDataFormatAutoConfiguration.java b/components-starter/camel-jibx-starter/src/main/java/org/apache/camel/dataformat/jibx/springboot/JibxDataFormatAutoConfiguration.java index a8ea649..e35833f 100644 --- a/components-starter/camel-jibx-starter/src/main/java/org/apache/camel/dataformat/jibx/springboot/JibxDataFormatAutoConfiguration.java +++ b/components-starter/camel-jibx-starter/src/main/java/org/apache/camel/dataformat/jibx/springboot/JibxDataFormatAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -44,6 +45,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class JibxDataFormatAutoConfiguration { @Bean(name = "jibx-dataformat") + @Scope("prototype") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(JibxDataFormat.class) public JibxDataFormat configureJibxDataFormat(CamelContext camelContext, http://git-wip-us.apache.org/repos/asf/camel/blob/9ce3d180/components-starter/camel-johnzon-starter/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-johnzon-starter/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatAutoConfiguration.java b/components-starter/camel-johnzon-starter/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatAutoConfiguration.java index 9f9870c..89d9d57 100644 --- a/components-starter/camel-johnzon-starter/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatAutoConfiguration.java +++ b/components-starter/camel-johnzon-starter/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -44,6 +45,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class JohnzonDataFormatAutoConfiguration { @Bean(name = "json-johnzon-dataformat") + @Scope("prototype") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(JohnzonDataFormat.class) public JohnzonDataFormat configureJohnzonDataFormat( http://git-wip-us.apache.org/repos/asf/camel/blob/9ce3d180/components-starter/camel-josql-starter/src/main/java/org/apache/camel/language/sql/springboot/SqlLanguageAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-josql-starter/src/main/java/org/apache/camel/language/sql/springboot/SqlLanguageAutoConfiguration.java b/components-starter/camel-josql-starter/src/main/java/org/apache/camel/language/sql/springboot/SqlLanguageAutoConfiguration.java index 1a3bb93..12f6854 100644 --- a/components-starter/camel-josql-starter/src/main/java/org/apache/camel/language/sql/springboot/SqlLanguageAutoConfiguration.java +++ b/components-starter/camel-josql-starter/src/main/java/org/apache/camel/language/sql/springboot/SqlLanguageAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -44,6 +45,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class SqlLanguageAutoConfiguration { @Bean(name = "sql-language") + @Scope("prototype") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(SqlLanguage.class) public SqlLanguage configureSqlLanguage(CamelContext camelContext, http://git-wip-us.apache.org/repos/asf/camel/blob/9ce3d180/components-starter/camel-jsonpath-starter/src/main/java/org/apache/camel/jsonpath/springboot/JsonPathLanguageAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-jsonpath-starter/src/main/java/org/apache/camel/jsonpath/springboot/JsonPathLanguageAutoConfiguration.java b/components-starter/camel-jsonpath-starter/src/main/java/org/apache/camel/jsonpath/springboot/JsonPathLanguageAutoConfiguration.java index 138adbd..f90f9c0 100644 --- a/components-starter/camel-jsonpath-starter/src/main/java/org/apache/camel/jsonpath/springboot/JsonPathLanguageAutoConfiguration.java +++ b/components-starter/camel-jsonpath-starter/src/main/java/org/apache/camel/jsonpath/springboot/JsonPathLanguageAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -44,6 +45,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class JsonPathLanguageAutoConfiguration { @Bean(name = "jsonpath-language") + @Scope("prototype") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(JsonPathLanguage.class) public JsonPathLanguage configureJsonPathLanguage( http://git-wip-us.apache.org/repos/asf/camel/blob/9ce3d180/components-starter/camel-juel-starter/src/main/java/org/apache/camel/language/juel/springboot/JuelLanguageAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-juel-starter/src/main/java/org/apache/camel/language/juel/springboot/JuelLanguageAutoConfiguration.java b/components-starter/camel-juel-starter/src/main/java/org/apache/camel/language/juel/springboot/JuelLanguageAutoConfiguration.java index 44383a2..151423d 100644 --- a/components-starter/camel-juel-starter/src/main/java/org/apache/camel/language/juel/springboot/JuelLanguageAutoConfiguration.java +++ b/components-starter/camel-juel-starter/src/main/java/org/apache/camel/language/juel/springboot/JuelLanguageAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -44,6 +45,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class JuelLanguageAutoConfiguration { @Bean(name = "el-language") + @Scope("prototype") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(JuelLanguage.class) public JuelLanguage configureJuelLanguage(CamelContext camelContext, http://git-wip-us.apache.org/repos/asf/camel/blob/9ce3d180/components-starter/camel-jxpath-starter/src/main/java/org/apache/camel/language/jxpath/springboot/JXPathLanguageAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-jxpath-starter/src/main/java/org/apache/camel/language/jxpath/springboot/JXPathLanguageAutoConfiguration.java b/components-starter/camel-jxpath-starter/src/main/java/org/apache/camel/language/jxpath/springboot/JXPathLanguageAutoConfiguration.java index e48d684..c6f2a87 100644 --- a/components-starter/camel-jxpath-starter/src/main/java/org/apache/camel/language/jxpath/springboot/JXPathLanguageAutoConfiguration.java +++ b/components-starter/camel-jxpath-starter/src/main/java/org/apache/camel/language/jxpath/springboot/JXPathLanguageAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -44,6 +45,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class JXPathLanguageAutoConfiguration { @Bean(name = "jxpath-language") + @Scope("prototype") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(JXPathLanguage.class) public JXPathLanguage configureJXPathLanguage(CamelContext camelContext, http://git-wip-us.apache.org/repos/asf/camel/blob/9ce3d180/components-starter/camel-lzf-starter/src/main/java/org/apache/camel/dataformat/lzf/springboot/LZFDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-lzf-starter/src/main/java/org/apache/camel/dataformat/lzf/springboot/LZFDataFormatAutoConfiguration.java b/components-starter/camel-lzf-starter/src/main/java/org/apache/camel/dataformat/lzf/springboot/LZFDataFormatAutoConfiguration.java index b433c2b..13c788e 100644 --- a/components-starter/camel-lzf-starter/src/main/java/org/apache/camel/dataformat/lzf/springboot/LZFDataFormatAutoConfiguration.java +++ b/components-starter/camel-lzf-starter/src/main/java/org/apache/camel/dataformat/lzf/springboot/LZFDataFormatAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -44,6 +45,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class LZFDataFormatAutoConfiguration { @Bean(name = "lzf-dataformat") + @Scope("prototype") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(LZFDataFormat.class) public LZFDataFormat configureLZFDataFormat(CamelContext camelContext, http://git-wip-us.apache.org/repos/asf/camel/blob/9ce3d180/components-starter/camel-mail-starter/src/main/java/org/apache/camel/dataformat/mime/multipart/springboot/MimeMultipartDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-mail-starter/src/main/java/org/apache/camel/dataformat/mime/multipart/springboot/MimeMultipartDataFormatAutoConfiguration.java b/components-starter/camel-mail-starter/src/main/java/org/apache/camel/dataformat/mime/multipart/springboot/MimeMultipartDataFormatAutoConfiguration.java index e70c6f2..fdb61d0 100644 --- a/components-starter/camel-mail-starter/src/main/java/org/apache/camel/dataformat/mime/multipart/springboot/MimeMultipartDataFormatAutoConfiguration.java +++ b/components-starter/camel-mail-starter/src/main/java/org/apache/camel/dataformat/mime/multipart/springboot/MimeMultipartDataFormatAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -44,6 +45,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class MimeMultipartDataFormatAutoConfiguration { @Bean(name = "mime-multipart-dataformat") + @Scope("prototype") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(MimeMultipartDataFormat.class) public MimeMultipartDataFormat configureMimeMultipartDataFormat( http://git-wip-us.apache.org/repos/asf/camel/blob/9ce3d180/components-starter/camel-mvel-starter/src/main/java/org/apache/camel/language/mvel/springboot/MvelLanguageAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-mvel-starter/src/main/java/org/apache/camel/language/mvel/springboot/MvelLanguageAutoConfiguration.java b/components-starter/camel-mvel-starter/src/main/java/org/apache/camel/language/mvel/springboot/MvelLanguageAutoConfiguration.java index 5993f02..73d9c45 100644 --- a/components-starter/camel-mvel-starter/src/main/java/org/apache/camel/language/mvel/springboot/MvelLanguageAutoConfiguration.java +++ b/components-starter/camel-mvel-starter/src/main/java/org/apache/camel/language/mvel/springboot/MvelLanguageAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -44,6 +45,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class MvelLanguageAutoConfiguration { @Bean(name = "mvel-language") + @Scope("prototype") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(MvelLanguage.class) public MvelLanguage configureMvelLanguage(CamelContext camelContext, http://git-wip-us.apache.org/repos/asf/camel/blob/9ce3d180/components-starter/camel-ognl-starter/src/main/java/org/apache/camel/language/ognl/springboot/OgnlLanguageAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-ognl-starter/src/main/java/org/apache/camel/language/ognl/springboot/OgnlLanguageAutoConfiguration.java b/components-starter/camel-ognl-starter/src/main/java/org/apache/camel/language/ognl/springboot/OgnlLanguageAutoConfiguration.java index d516940..47c2e2f 100644 --- a/components-starter/camel-ognl-starter/src/main/java/org/apache/camel/language/ognl/springboot/OgnlLanguageAutoConfiguration.java +++ b/components-starter/camel-ognl-starter/src/main/java/org/apache/camel/language/ognl/springboot/OgnlLanguageAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -44,6 +45,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class OgnlLanguageAutoConfiguration { @Bean(name = "ognl-language") + @Scope("prototype") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(OgnlLanguage.class) public OgnlLanguage configureOgnlLanguage(CamelContext camelContext, http://git-wip-us.apache.org/repos/asf/camel/blob/9ce3d180/components-starter/camel-protobuf-starter/src/main/java/org/apache/camel/dataformat/protobuf/springboot/ProtobufDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-protobuf-starter/src/main/java/org/apache/camel/dataformat/protobuf/springboot/ProtobufDataFormatAutoConfiguration.java b/components-starter/camel-protobuf-starter/src/main/java/org/apache/camel/dataformat/protobuf/springboot/ProtobufDataFormatAutoConfiguration.java index 5f2d91d..4433a76 100644 --- a/components-starter/camel-protobuf-starter/src/main/java/org/apache/camel/dataformat/protobuf/springboot/ProtobufDataFormatAutoConfiguration.java +++ b/components-starter/camel-protobuf-starter/src/main/java/org/apache/camel/dataformat/protobuf/springboot/ProtobufDataFormatAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -44,6 +45,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class ProtobufDataFormatAutoConfiguration { @Bean(name = "protobuf-dataformat") + @Scope("prototype") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(ProtobufDataFormat.class) public ProtobufDataFormat configureProtobufDataFormat( http://git-wip-us.apache.org/repos/asf/camel/blob/9ce3d180/components-starter/camel-rss-starter/src/main/java/org/apache/camel/dataformat/rss/springboot/RssDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-rss-starter/src/main/java/org/apache/camel/dataformat/rss/springboot/RssDataFormatAutoConfiguration.java b/components-starter/camel-rss-starter/src/main/java/org/apache/camel/dataformat/rss/springboot/RssDataFormatAutoConfiguration.java index 6f46566..5d1e46d 100644 --- a/components-starter/camel-rss-starter/src/main/java/org/apache/camel/dataformat/rss/springboot/RssDataFormatAutoConfiguration.java +++ b/components-starter/camel-rss-starter/src/main/java/org/apache/camel/dataformat/rss/springboot/RssDataFormatAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -44,6 +45,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class RssDataFormatAutoConfiguration { @Bean(name = "rss-dataformat") + @Scope("prototype") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(RssDataFormat.class) public RssDataFormat configureRssDataFormat(CamelContext camelContext, http://git-wip-us.apache.org/repos/asf/camel/blob/9ce3d180/components-starter/camel-saxon-starter/src/main/java/org/apache/camel/language/xquery/springboot/XQueryLanguageAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-saxon-starter/src/main/java/org/apache/camel/language/xquery/springboot/XQueryLanguageAutoConfiguration.java b/components-starter/camel-saxon-starter/src/main/java/org/apache/camel/language/xquery/springboot/XQueryLanguageAutoConfiguration.java index 774352f..0790c75 100644 --- a/components-starter/camel-saxon-starter/src/main/java/org/apache/camel/language/xquery/springboot/XQueryLanguageAutoConfiguration.java +++ b/components-starter/camel-saxon-starter/src/main/java/org/apache/camel/language/xquery/springboot/XQueryLanguageAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -44,6 +45,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class XQueryLanguageAutoConfiguration { @Bean(name = "xquery-language") + @Scope("prototype") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(XQueryLanguage.class) public XQueryLanguage configureXQueryLanguage(CamelContext camelContext, http://git-wip-us.apache.org/repos/asf/camel/blob/9ce3d180/components-starter/camel-script-starter/src/main/java/org/apache/camel/builder/script/springboot/JavaScriptLanguageAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-script-starter/src/main/java/org/apache/camel/builder/script/springboot/JavaScriptLanguageAutoConfiguration.java b/components-starter/camel-script-starter/src/main/java/org/apache/camel/builder/script/springboot/JavaScriptLanguageAutoConfiguration.java index e114a26..a323ab6 100644 --- a/components-starter/camel-script-starter/src/main/java/org/apache/camel/builder/script/springboot/JavaScriptLanguageAutoConfiguration.java +++ b/components-starter/camel-script-starter/src/main/java/org/apache/camel/builder/script/springboot/JavaScriptLanguageAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -44,6 +45,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class JavaScriptLanguageAutoConfiguration { @Bean(name = "javaScript-language") + @Scope("prototype") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(JavaScriptLanguage.class) public JavaScriptLanguage configureJavaScriptLanguage( http://git-wip-us.apache.org/repos/asf/camel/blob/9ce3d180/components-starter/camel-script-starter/src/main/java/org/apache/camel/builder/script/springboot/PhpLanguageAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-script-starter/src/main/java/org/apache/camel/builder/script/springboot/PhpLanguageAutoConfiguration.java b/components-starter/camel-script-starter/src/main/java/org/apache/camel/builder/script/springboot/PhpLanguageAutoConfiguration.java index 24667c0..f7e549e 100644 --- a/components-starter/camel-script-starter/src/main/java/org/apache/camel/builder/script/springboot/PhpLanguageAutoConfiguration.java +++ b/components-starter/camel-script-starter/src/main/java/org/apache/camel/builder/script/springboot/PhpLanguageAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -44,6 +45,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class PhpLanguageAutoConfiguration { @Bean(name = "php-language") + @Scope("prototype") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(PhpLanguage.class) public PhpLanguage configurePhpLanguage(CamelContext camelContext, http://git-wip-us.apache.org/repos/asf/camel/blob/9ce3d180/components-starter/camel-script-starter/src/main/java/org/apache/camel/builder/script/springboot/PythonLanguageAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/components-starter/camel-script-starter/src/main/java/org/apache/camel/builder/script/springboot/PythonLanguageAutoConfiguration.java b/components-starter/camel-script-starter/src/main/java/org/apache/camel/builder/script/springboot/PythonLanguageAutoConfiguration.java index a8e80bc..d2b1ed6 100644 --- a/components-starter/camel-script-starter/src/main/java/org/apache/camel/builder/script/springboot/PythonLanguageAutoConfiguration.java +++ b/components-starter/camel-script-starter/src/main/java/org/apache/camel/builder/script/springboot/PythonLanguageAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Scope; import org.springframework.core.type.AnnotatedTypeMetadata; /** @@ -44,6 +45,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata; public class PythonLanguageAutoConfiguration { @Bean(name = "python-language") + @Scope("prototype") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(PythonLanguage.class) public PythonLanguage configurePythonLanguage(CamelContext camelContext,