http://git-wip-us.apache.org/repos/asf/camel/blob/c0a9f5cd/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/GzipDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/GzipDataFormatAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/GzipDataFormatAutoConfiguration.java index 91b952c..81c052e 100644 --- a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/GzipDataFormatAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/GzipDataFormatAutoConfiguration.java @@ -20,7 +20,10 @@ import java.util.HashMap; import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; +import org.apache.camel.RuntimeCamelException; import org.apache.camel.impl.GzipDataFormat; +import org.apache.camel.spi.DataFormat; +import org.apache.camel.spi.DataFormatFactory; import org.apache.camel.util.IntrospectionSupport; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionMessage; @@ -35,7 +38,6 @@ 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; /** @@ -48,26 +50,36 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @EnableConfigurationProperties(GzipDataFormatConfiguration.class) public class GzipDataFormatAutoConfiguration { - @Bean(name = "gzip-dataformat") - @Scope("prototype") + @Bean(name = "gzip-dataformat-factory") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(GzipDataFormat.class) - public GzipDataFormat configureGzipDataFormat(CamelContext camelContext, - GzipDataFormatConfiguration configuration) throws Exception { - GzipDataFormat dataformat = new GzipDataFormat(); - if (CamelContextAware.class.isAssignableFrom(GzipDataFormat.class)) { - CamelContextAware contextAware = CamelContextAware.class - .cast(dataformat); - if (contextAware != null) { - contextAware.setCamelContext(camelContext); + public DataFormatFactory configureGzipDataFormatFactory( + final CamelContext camelContext, + final GzipDataFormatConfiguration configuration) { + return new DataFormatFactory() { + public DataFormat newInstance() { + GzipDataFormat dataformat = new GzipDataFormat(); + if (CamelContextAware.class + .isAssignableFrom(GzipDataFormat.class)) { + CamelContextAware contextAware = CamelContextAware.class + .cast(dataformat); + if (contextAware != null) { + contextAware.setCamelContext(camelContext); + } + } + try { + Map<String, Object> parameters = new HashMap<>(); + IntrospectionSupport.getProperties(configuration, + parameters, null, false); + IntrospectionSupport.setProperties(camelContext, + camelContext.getTypeConverter(), dataformat, + parameters); + } catch (Exception e) { + throw new RuntimeCamelException(e); + } + return dataformat; } - } - Map<String, Object> parameters = new HashMap<>(); - IntrospectionSupport.getProperties(configuration, parameters, null, - false); - IntrospectionSupport.setProperties(camelContext, - camelContext.getTypeConverter(), dataformat, parameters); - return dataformat; + }; } public static class Condition extends SpringBootCondition {
http://git-wip-us.apache.org/repos/asf/camel/blob/c0a9f5cd/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/SerializationDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/SerializationDataFormatAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/SerializationDataFormatAutoConfiguration.java index b19cd1d..27f6dbb 100644 --- a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/SerializationDataFormatAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/SerializationDataFormatAutoConfiguration.java @@ -20,7 +20,10 @@ import java.util.HashMap; import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; +import org.apache.camel.RuntimeCamelException; import org.apache.camel.impl.SerializationDataFormat; +import org.apache.camel.spi.DataFormat; +import org.apache.camel.spi.DataFormatFactory; import org.apache.camel.util.IntrospectionSupport; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionMessage; @@ -35,7 +38,6 @@ 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; /** @@ -48,29 +50,36 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @EnableConfigurationProperties(SerializationDataFormatConfiguration.class) public class SerializationDataFormatAutoConfiguration { - @Bean(name = "serialization-dataformat") - @Scope("prototype") + @Bean(name = "serialization-dataformat-factory") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(SerializationDataFormat.class) - public SerializationDataFormat configureSerializationDataFormat( - CamelContext camelContext, - SerializationDataFormatConfiguration configuration) - throws Exception { - SerializationDataFormat dataformat = new SerializationDataFormat(); - if (CamelContextAware.class - .isAssignableFrom(SerializationDataFormat.class)) { - CamelContextAware contextAware = CamelContextAware.class - .cast(dataformat); - if (contextAware != null) { - contextAware.setCamelContext(camelContext); + public DataFormatFactory configureSerializationDataFormatFactory( + final CamelContext camelContext, + final SerializationDataFormatConfiguration configuration) { + return new DataFormatFactory() { + public DataFormat newInstance() { + SerializationDataFormat dataformat = new SerializationDataFormat(); + if (CamelContextAware.class + .isAssignableFrom(SerializationDataFormat.class)) { + CamelContextAware contextAware = CamelContextAware.class + .cast(dataformat); + if (contextAware != null) { + contextAware.setCamelContext(camelContext); + } + } + try { + Map<String, Object> parameters = new HashMap<>(); + IntrospectionSupport.getProperties(configuration, + parameters, null, false); + IntrospectionSupport.setProperties(camelContext, + camelContext.getTypeConverter(), dataformat, + parameters); + } catch (Exception e) { + throw new RuntimeCamelException(e); + } + return dataformat; } - } - Map<String, Object> parameters = new HashMap<>(); - IntrospectionSupport.getProperties(configuration, parameters, null, - false); - IntrospectionSupport.setProperties(camelContext, - camelContext.getTypeConverter(), dataformat, parameters); - return dataformat; + }; } public static class Condition extends SpringBootCondition { http://git-wip-us.apache.org/repos/asf/camel/blob/c0a9f5cd/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/StringDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/StringDataFormatAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/StringDataFormatAutoConfiguration.java index e3ebb70..d699e97 100644 --- a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/StringDataFormatAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/StringDataFormatAutoConfiguration.java @@ -20,7 +20,10 @@ import java.util.HashMap; import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; +import org.apache.camel.RuntimeCamelException; import org.apache.camel.impl.StringDataFormat; +import org.apache.camel.spi.DataFormat; +import org.apache.camel.spi.DataFormatFactory; import org.apache.camel.util.IntrospectionSupport; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionMessage; @@ -35,7 +38,6 @@ 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; /** @@ -48,27 +50,36 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @EnableConfigurationProperties(StringDataFormatConfiguration.class) public class StringDataFormatAutoConfiguration { - @Bean(name = "string-dataformat") - @Scope("prototype") + @Bean(name = "string-dataformat-factory") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(StringDataFormat.class) - public StringDataFormat configureStringDataFormat( - CamelContext camelContext, - StringDataFormatConfiguration configuration) throws Exception { - StringDataFormat dataformat = new StringDataFormat(); - if (CamelContextAware.class.isAssignableFrom(StringDataFormat.class)) { - CamelContextAware contextAware = CamelContextAware.class - .cast(dataformat); - if (contextAware != null) { - contextAware.setCamelContext(camelContext); + public DataFormatFactory configureStringDataFormatFactory( + final CamelContext camelContext, + final StringDataFormatConfiguration configuration) { + return new DataFormatFactory() { + public DataFormat newInstance() { + StringDataFormat dataformat = new StringDataFormat(); + if (CamelContextAware.class + .isAssignableFrom(StringDataFormat.class)) { + CamelContextAware contextAware = CamelContextAware.class + .cast(dataformat); + if (contextAware != null) { + contextAware.setCamelContext(camelContext); + } + } + try { + Map<String, Object> parameters = new HashMap<>(); + IntrospectionSupport.getProperties(configuration, + parameters, null, false); + IntrospectionSupport.setProperties(camelContext, + camelContext.getTypeConverter(), dataformat, + parameters); + } catch (Exception e) { + throw new RuntimeCamelException(e); + } + return dataformat; } - } - Map<String, Object> parameters = new HashMap<>(); - IntrospectionSupport.getProperties(configuration, parameters, null, - false); - IntrospectionSupport.setProperties(camelContext, - camelContext.getTypeConverter(), dataformat, parameters); - return dataformat; + }; } public static class Condition extends SpringBootCondition { http://git-wip-us.apache.org/repos/asf/camel/blob/c0a9f5cd/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/ZipDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/ZipDataFormatAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/ZipDataFormatAutoConfiguration.java index 992c168..26ea5fe 100644 --- a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/ZipDataFormatAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/impl/springboot/ZipDataFormatAutoConfiguration.java @@ -20,7 +20,10 @@ import java.util.HashMap; import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; +import org.apache.camel.RuntimeCamelException; import org.apache.camel.impl.ZipDataFormat; +import org.apache.camel.spi.DataFormat; +import org.apache.camel.spi.DataFormatFactory; import org.apache.camel.util.IntrospectionSupport; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionMessage; @@ -35,7 +38,6 @@ 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; /** @@ -48,26 +50,36 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @EnableConfigurationProperties(ZipDataFormatConfiguration.class) public class ZipDataFormatAutoConfiguration { - @Bean(name = "zip-dataformat") - @Scope("prototype") + @Bean(name = "zip-dataformat-factory") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(ZipDataFormat.class) - public ZipDataFormat configureZipDataFormat(CamelContext camelContext, - ZipDataFormatConfiguration configuration) throws Exception { - ZipDataFormat dataformat = new ZipDataFormat(); - if (CamelContextAware.class.isAssignableFrom(ZipDataFormat.class)) { - CamelContextAware contextAware = CamelContextAware.class - .cast(dataformat); - if (contextAware != null) { - contextAware.setCamelContext(camelContext); + public DataFormatFactory configureZipDataFormatFactory( + final CamelContext camelContext, + final ZipDataFormatConfiguration configuration) { + return new DataFormatFactory() { + public DataFormat newInstance() { + ZipDataFormat dataformat = new ZipDataFormat(); + if (CamelContextAware.class + .isAssignableFrom(ZipDataFormat.class)) { + CamelContextAware contextAware = CamelContextAware.class + .cast(dataformat); + if (contextAware != null) { + contextAware.setCamelContext(camelContext); + } + } + try { + Map<String, Object> parameters = new HashMap<>(); + IntrospectionSupport.getProperties(configuration, + parameters, null, false); + IntrospectionSupport.setProperties(camelContext, + camelContext.getTypeConverter(), dataformat, + parameters); + } catch (Exception e) { + throw new RuntimeCamelException(e); + } + return dataformat; } - } - Map<String, Object> parameters = new HashMap<>(); - IntrospectionSupport.getProperties(configuration, parameters, null, - false); - IntrospectionSupport.setProperties(camelContext, - camelContext.getTypeConverter(), dataformat, parameters); - return dataformat; + }; } public static class Condition extends SpringBootCondition { http://git-wip-us.apache.org/repos/asf/camel/blob/c0a9f5cd/platforms/spring-boot/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/converter/crypto/springboot/CryptoDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/converter/crypto/springboot/CryptoDataFormatAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/converter/crypto/springboot/CryptoDataFormatAutoConfiguration.java index 3837a72..4b13322 100644 --- a/platforms/spring-boot/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/converter/crypto/springboot/CryptoDataFormatAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/converter/crypto/springboot/CryptoDataFormatAutoConfiguration.java @@ -20,7 +20,10 @@ import java.util.HashMap; import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; +import org.apache.camel.RuntimeCamelException; import org.apache.camel.converter.crypto.CryptoDataFormat; +import org.apache.camel.spi.DataFormat; +import org.apache.camel.spi.DataFormatFactory; import org.apache.camel.util.IntrospectionSupport; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionMessage; @@ -35,7 +38,6 @@ 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; /** @@ -48,27 +50,36 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @EnableConfigurationProperties(CryptoDataFormatConfiguration.class) public class CryptoDataFormatAutoConfiguration { - @Bean(name = "crypto-dataformat") - @Scope("prototype") + @Bean(name = "crypto-dataformat-factory") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(CryptoDataFormat.class) - public CryptoDataFormat configureCryptoDataFormat( - CamelContext camelContext, - CryptoDataFormatConfiguration configuration) throws Exception { - CryptoDataFormat dataformat = new CryptoDataFormat(); - if (CamelContextAware.class.isAssignableFrom(CryptoDataFormat.class)) { - CamelContextAware contextAware = CamelContextAware.class - .cast(dataformat); - if (contextAware != null) { - contextAware.setCamelContext(camelContext); + public DataFormatFactory configureCryptoDataFormatFactory( + final CamelContext camelContext, + final CryptoDataFormatConfiguration configuration) { + return new DataFormatFactory() { + public DataFormat newInstance() { + CryptoDataFormat dataformat = new CryptoDataFormat(); + if (CamelContextAware.class + .isAssignableFrom(CryptoDataFormat.class)) { + CamelContextAware contextAware = CamelContextAware.class + .cast(dataformat); + if (contextAware != null) { + contextAware.setCamelContext(camelContext); + } + } + try { + Map<String, Object> parameters = new HashMap<>(); + IntrospectionSupport.getProperties(configuration, + parameters, null, false); + IntrospectionSupport.setProperties(camelContext, + camelContext.getTypeConverter(), dataformat, + parameters); + } catch (Exception e) { + throw new RuntimeCamelException(e); + } + return dataformat; } - } - Map<String, Object> parameters = new HashMap<>(); - IntrospectionSupport.getProperties(configuration, parameters, null, - false); - IntrospectionSupport.setProperties(camelContext, - camelContext.getTypeConverter(), dataformat, parameters); - return dataformat; + }; } public static class Condition extends SpringBootCondition { http://git-wip-us.apache.org/repos/asf/camel/blob/c0a9f5cd/platforms/spring-boot/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/converter/crypto/springboot/PGPDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/converter/crypto/springboot/PGPDataFormatAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/converter/crypto/springboot/PGPDataFormatAutoConfiguration.java index 5df0116..8dd787a 100644 --- a/platforms/spring-boot/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/converter/crypto/springboot/PGPDataFormatAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/converter/crypto/springboot/PGPDataFormatAutoConfiguration.java @@ -20,7 +20,10 @@ import java.util.HashMap; import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; +import org.apache.camel.RuntimeCamelException; import org.apache.camel.converter.crypto.PGPDataFormat; +import org.apache.camel.spi.DataFormat; +import org.apache.camel.spi.DataFormatFactory; import org.apache.camel.util.IntrospectionSupport; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionMessage; @@ -35,7 +38,6 @@ 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; /** @@ -48,26 +50,36 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @EnableConfigurationProperties(PGPDataFormatConfiguration.class) public class PGPDataFormatAutoConfiguration { - @Bean(name = "pgp-dataformat") - @Scope("prototype") + @Bean(name = "pgp-dataformat-factory") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(PGPDataFormat.class) - public PGPDataFormat configurePGPDataFormat(CamelContext camelContext, - PGPDataFormatConfiguration configuration) throws Exception { - PGPDataFormat dataformat = new PGPDataFormat(); - if (CamelContextAware.class.isAssignableFrom(PGPDataFormat.class)) { - CamelContextAware contextAware = CamelContextAware.class - .cast(dataformat); - if (contextAware != null) { - contextAware.setCamelContext(camelContext); + public DataFormatFactory configurePGPDataFormatFactory( + final CamelContext camelContext, + final PGPDataFormatConfiguration configuration) { + return new DataFormatFactory() { + public DataFormat newInstance() { + PGPDataFormat dataformat = new PGPDataFormat(); + if (CamelContextAware.class + .isAssignableFrom(PGPDataFormat.class)) { + CamelContextAware contextAware = CamelContextAware.class + .cast(dataformat); + if (contextAware != null) { + contextAware.setCamelContext(camelContext); + } + } + try { + Map<String, Object> parameters = new HashMap<>(); + IntrospectionSupport.getProperties(configuration, + parameters, null, false); + IntrospectionSupport.setProperties(camelContext, + camelContext.getTypeConverter(), dataformat, + parameters); + } catch (Exception e) { + throw new RuntimeCamelException(e); + } + return dataformat; } - } - Map<String, Object> parameters = new HashMap<>(); - IntrospectionSupport.getProperties(configuration, parameters, null, - false); - IntrospectionSupport.setProperties(camelContext, - camelContext.getTypeConverter(), dataformat, parameters); - return dataformat; + }; } public static class Condition extends SpringBootCondition { http://git-wip-us.apache.org/repos/asf/camel/blob/c0a9f5cd/platforms/spring-boot/components-starter/camel-csv-starter/src/main/java/org/apache/camel/dataformat/csv/springboot/CsvDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-csv-starter/src/main/java/org/apache/camel/dataformat/csv/springboot/CsvDataFormatAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-csv-starter/src/main/java/org/apache/camel/dataformat/csv/springboot/CsvDataFormatAutoConfiguration.java index 15298a3..0eccf24 100644 --- a/platforms/spring-boot/components-starter/camel-csv-starter/src/main/java/org/apache/camel/dataformat/csv/springboot/CsvDataFormatAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-csv-starter/src/main/java/org/apache/camel/dataformat/csv/springboot/CsvDataFormatAutoConfiguration.java @@ -20,7 +20,10 @@ import java.util.HashMap; import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; +import org.apache.camel.RuntimeCamelException; import org.apache.camel.dataformat.csv.CsvDataFormat; +import org.apache.camel.spi.DataFormat; +import org.apache.camel.spi.DataFormatFactory; import org.apache.camel.util.IntrospectionSupport; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionMessage; @@ -35,7 +38,6 @@ 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; /** @@ -48,26 +50,36 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @EnableConfigurationProperties(CsvDataFormatConfiguration.class) public class CsvDataFormatAutoConfiguration { - @Bean(name = "csv-dataformat") - @Scope("prototype") + @Bean(name = "csv-dataformat-factory") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(CsvDataFormat.class) - public CsvDataFormat configureCsvDataFormat(CamelContext camelContext, - CsvDataFormatConfiguration configuration) throws Exception { - CsvDataFormat dataformat = new CsvDataFormat(); - if (CamelContextAware.class.isAssignableFrom(CsvDataFormat.class)) { - CamelContextAware contextAware = CamelContextAware.class - .cast(dataformat); - if (contextAware != null) { - contextAware.setCamelContext(camelContext); + public DataFormatFactory configureCsvDataFormatFactory( + final CamelContext camelContext, + final CsvDataFormatConfiguration configuration) { + return new DataFormatFactory() { + public DataFormat newInstance() { + CsvDataFormat dataformat = new CsvDataFormat(); + if (CamelContextAware.class + .isAssignableFrom(CsvDataFormat.class)) { + CamelContextAware contextAware = CamelContextAware.class + .cast(dataformat); + if (contextAware != null) { + contextAware.setCamelContext(camelContext); + } + } + try { + Map<String, Object> parameters = new HashMap<>(); + IntrospectionSupport.getProperties(configuration, + parameters, null, false); + IntrospectionSupport.setProperties(camelContext, + camelContext.getTypeConverter(), dataformat, + parameters); + } catch (Exception e) { + throw new RuntimeCamelException(e); + } + return dataformat; } - } - Map<String, Object> parameters = new HashMap<>(); - IntrospectionSupport.getProperties(configuration, parameters, null, - false); - IntrospectionSupport.setProperties(camelContext, - camelContext.getTypeConverter(), dataformat, parameters); - return dataformat; + }; } public static class Condition extends SpringBootCondition { http://git-wip-us.apache.org/repos/asf/camel/blob/c0a9f5cd/platforms/spring-boot/components-starter/camel-flatpack-starter/src/main/java/org/apache/camel/dataformat/flatpack/springboot/FlatpackDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-flatpack-starter/src/main/java/org/apache/camel/dataformat/flatpack/springboot/FlatpackDataFormatAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-flatpack-starter/src/main/java/org/apache/camel/dataformat/flatpack/springboot/FlatpackDataFormatAutoConfiguration.java index 04c4ed4..ce9a747 100644 --- a/platforms/spring-boot/components-starter/camel-flatpack-starter/src/main/java/org/apache/camel/dataformat/flatpack/springboot/FlatpackDataFormatAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-flatpack-starter/src/main/java/org/apache/camel/dataformat/flatpack/springboot/FlatpackDataFormatAutoConfiguration.java @@ -20,7 +20,10 @@ import java.util.HashMap; import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; +import org.apache.camel.RuntimeCamelException; import org.apache.camel.dataformat.flatpack.FlatpackDataFormat; +import org.apache.camel.spi.DataFormat; +import org.apache.camel.spi.DataFormatFactory; import org.apache.camel.util.IntrospectionSupport; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionMessage; @@ -35,7 +38,6 @@ 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; /** @@ -48,27 +50,36 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @EnableConfigurationProperties(FlatpackDataFormatConfiguration.class) public class FlatpackDataFormatAutoConfiguration { - @Bean(name = "flatpack-dataformat") - @Scope("prototype") + @Bean(name = "flatpack-dataformat-factory") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(FlatpackDataFormat.class) - public FlatpackDataFormat configureFlatpackDataFormat( - CamelContext camelContext, - FlatpackDataFormatConfiguration configuration) throws Exception { - FlatpackDataFormat dataformat = new FlatpackDataFormat(); - if (CamelContextAware.class.isAssignableFrom(FlatpackDataFormat.class)) { - CamelContextAware contextAware = CamelContextAware.class - .cast(dataformat); - if (contextAware != null) { - contextAware.setCamelContext(camelContext); + public DataFormatFactory configureFlatpackDataFormatFactory( + final CamelContext camelContext, + final FlatpackDataFormatConfiguration configuration) { + return new DataFormatFactory() { + public DataFormat newInstance() { + FlatpackDataFormat dataformat = new FlatpackDataFormat(); + if (CamelContextAware.class + .isAssignableFrom(FlatpackDataFormat.class)) { + CamelContextAware contextAware = CamelContextAware.class + .cast(dataformat); + if (contextAware != null) { + contextAware.setCamelContext(camelContext); + } + } + try { + Map<String, Object> parameters = new HashMap<>(); + IntrospectionSupport.getProperties(configuration, + parameters, null, false); + IntrospectionSupport.setProperties(camelContext, + camelContext.getTypeConverter(), dataformat, + parameters); + } catch (Exception e) { + throw new RuntimeCamelException(e); + } + return dataformat; } - } - Map<String, Object> parameters = new HashMap<>(); - IntrospectionSupport.getProperties(configuration, parameters, null, - false); - IntrospectionSupport.setProperties(camelContext, - camelContext.getTypeConverter(), dataformat, parameters); - return dataformat; + }; } public static class Condition extends SpringBootCondition { http://git-wip-us.apache.org/repos/asf/camel/blob/c0a9f5cd/platforms/spring-boot/components-starter/camel-gson-starter/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-gson-starter/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-gson-starter/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatAutoConfiguration.java index 1e70c02..97122f2 100644 --- a/platforms/spring-boot/components-starter/camel-gson-starter/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-gson-starter/src/main/java/org/apache/camel/component/gson/springboot/GsonDataFormatAutoConfiguration.java @@ -20,7 +20,10 @@ import java.util.HashMap; import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; +import org.apache.camel.RuntimeCamelException; import org.apache.camel.component.gson.GsonDataFormat; +import org.apache.camel.spi.DataFormat; +import org.apache.camel.spi.DataFormatFactory; import org.apache.camel.util.IntrospectionSupport; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionMessage; @@ -35,7 +38,6 @@ 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; /** @@ -48,26 +50,36 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @EnableConfigurationProperties(GsonDataFormatConfiguration.class) public class GsonDataFormatAutoConfiguration { - @Bean(name = "json-gson-dataformat") - @Scope("prototype") + @Bean(name = "json-gson-dataformat-factory") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(GsonDataFormat.class) - public GsonDataFormat configureGsonDataFormat(CamelContext camelContext, - GsonDataFormatConfiguration configuration) throws Exception { - GsonDataFormat dataformat = new GsonDataFormat(); - if (CamelContextAware.class.isAssignableFrom(GsonDataFormat.class)) { - CamelContextAware contextAware = CamelContextAware.class - .cast(dataformat); - if (contextAware != null) { - contextAware.setCamelContext(camelContext); + public DataFormatFactory configureGsonDataFormatFactory( + final CamelContext camelContext, + final GsonDataFormatConfiguration configuration) { + return new DataFormatFactory() { + public DataFormat newInstance() { + GsonDataFormat dataformat = new GsonDataFormat(); + if (CamelContextAware.class + .isAssignableFrom(GsonDataFormat.class)) { + CamelContextAware contextAware = CamelContextAware.class + .cast(dataformat); + if (contextAware != null) { + contextAware.setCamelContext(camelContext); + } + } + try { + Map<String, Object> parameters = new HashMap<>(); + IntrospectionSupport.getProperties(configuration, + parameters, null, false); + IntrospectionSupport.setProperties(camelContext, + camelContext.getTypeConverter(), dataformat, + parameters); + } catch (Exception e) { + throw new RuntimeCamelException(e); + } + return dataformat; } - } - Map<String, Object> parameters = new HashMap<>(); - IntrospectionSupport.getProperties(configuration, parameters, null, - false); - IntrospectionSupport.setProperties(camelContext, - camelContext.getTypeConverter(), dataformat, parameters); - return dataformat; + }; } public static class Condition extends SpringBootCondition { http://git-wip-us.apache.org/repos/asf/camel/blob/c0a9f5cd/platforms/spring-boot/components-starter/camel-hessian-starter/src/main/java/org/apache/camel/dataformat/hessian/springboot/HessianDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-hessian-starter/src/main/java/org/apache/camel/dataformat/hessian/springboot/HessianDataFormatAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-hessian-starter/src/main/java/org/apache/camel/dataformat/hessian/springboot/HessianDataFormatAutoConfiguration.java index 17546ea..11c817e 100644 --- a/platforms/spring-boot/components-starter/camel-hessian-starter/src/main/java/org/apache/camel/dataformat/hessian/springboot/HessianDataFormatAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-hessian-starter/src/main/java/org/apache/camel/dataformat/hessian/springboot/HessianDataFormatAutoConfiguration.java @@ -20,7 +20,10 @@ import java.util.HashMap; import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; +import org.apache.camel.RuntimeCamelException; import org.apache.camel.dataformat.hessian.HessianDataFormat; +import org.apache.camel.spi.DataFormat; +import org.apache.camel.spi.DataFormatFactory; import org.apache.camel.util.IntrospectionSupport; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionMessage; @@ -35,7 +38,6 @@ 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; /** @@ -48,27 +50,36 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @EnableConfigurationProperties(HessianDataFormatConfiguration.class) public class HessianDataFormatAutoConfiguration { - @Bean(name = "hessian-dataformat") - @Scope("prototype") + @Bean(name = "hessian-dataformat-factory") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(HessianDataFormat.class) - public HessianDataFormat configureHessianDataFormat( - CamelContext camelContext, - HessianDataFormatConfiguration configuration) throws Exception { - HessianDataFormat dataformat = new HessianDataFormat(); - if (CamelContextAware.class.isAssignableFrom(HessianDataFormat.class)) { - CamelContextAware contextAware = CamelContextAware.class - .cast(dataformat); - if (contextAware != null) { - contextAware.setCamelContext(camelContext); + public DataFormatFactory configureHessianDataFormatFactory( + final CamelContext camelContext, + final HessianDataFormatConfiguration configuration) { + return new DataFormatFactory() { + public DataFormat newInstance() { + HessianDataFormat dataformat = new HessianDataFormat(); + if (CamelContextAware.class + .isAssignableFrom(HessianDataFormat.class)) { + CamelContextAware contextAware = CamelContextAware.class + .cast(dataformat); + if (contextAware != null) { + contextAware.setCamelContext(camelContext); + } + } + try { + Map<String, Object> parameters = new HashMap<>(); + IntrospectionSupport.getProperties(configuration, + parameters, null, false); + IntrospectionSupport.setProperties(camelContext, + camelContext.getTypeConverter(), dataformat, + parameters); + } catch (Exception e) { + throw new RuntimeCamelException(e); + } + return dataformat; } - } - Map<String, Object> parameters = new HashMap<>(); - IntrospectionSupport.getProperties(configuration, parameters, null, - false); - IntrospectionSupport.setProperties(camelContext, - camelContext.getTypeConverter(), dataformat, parameters); - return dataformat; + }; } public static class Condition extends SpringBootCondition { http://git-wip-us.apache.org/repos/asf/camel/blob/c0a9f5cd/platforms/spring-boot/components-starter/camel-hl7-starter/src/main/java/org/apache/camel/component/hl7/springboot/HL7DataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-hl7-starter/src/main/java/org/apache/camel/component/hl7/springboot/HL7DataFormatAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-hl7-starter/src/main/java/org/apache/camel/component/hl7/springboot/HL7DataFormatAutoConfiguration.java index fdf2b1d..55a1bed 100644 --- a/platforms/spring-boot/components-starter/camel-hl7-starter/src/main/java/org/apache/camel/component/hl7/springboot/HL7DataFormatAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-hl7-starter/src/main/java/org/apache/camel/component/hl7/springboot/HL7DataFormatAutoConfiguration.java @@ -20,7 +20,10 @@ import java.util.HashMap; import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; +import org.apache.camel.RuntimeCamelException; import org.apache.camel.component.hl7.HL7DataFormat; +import org.apache.camel.spi.DataFormat; +import org.apache.camel.spi.DataFormatFactory; import org.apache.camel.util.IntrospectionSupport; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionMessage; @@ -35,7 +38,6 @@ 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; /** @@ -48,26 +50,36 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @EnableConfigurationProperties(HL7DataFormatConfiguration.class) public class HL7DataFormatAutoConfiguration { - @Bean(name = "hl7-dataformat") - @Scope("prototype") + @Bean(name = "hl7-dataformat-factory") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(HL7DataFormat.class) - public HL7DataFormat configureHL7DataFormat(CamelContext camelContext, - HL7DataFormatConfiguration configuration) throws Exception { - HL7DataFormat dataformat = new HL7DataFormat(); - if (CamelContextAware.class.isAssignableFrom(HL7DataFormat.class)) { - CamelContextAware contextAware = CamelContextAware.class - .cast(dataformat); - if (contextAware != null) { - contextAware.setCamelContext(camelContext); + public DataFormatFactory configureHL7DataFormatFactory( + final CamelContext camelContext, + final HL7DataFormatConfiguration configuration) { + return new DataFormatFactory() { + public DataFormat newInstance() { + HL7DataFormat dataformat = new HL7DataFormat(); + if (CamelContextAware.class + .isAssignableFrom(HL7DataFormat.class)) { + CamelContextAware contextAware = CamelContextAware.class + .cast(dataformat); + if (contextAware != null) { + contextAware.setCamelContext(camelContext); + } + } + try { + Map<String, Object> parameters = new HashMap<>(); + IntrospectionSupport.getProperties(configuration, + parameters, null, false); + IntrospectionSupport.setProperties(camelContext, + camelContext.getTypeConverter(), dataformat, + parameters); + } catch (Exception e) { + throw new RuntimeCamelException(e); + } + return dataformat; } - } - Map<String, Object> parameters = new HashMap<>(); - IntrospectionSupport.getProperties(configuration, parameters, null, - false); - IntrospectionSupport.setProperties(camelContext, - camelContext.getTypeConverter(), dataformat, parameters); - return dataformat; + }; } public static class Condition extends SpringBootCondition { http://git-wip-us.apache.org/repos/asf/camel/blob/c0a9f5cd/platforms/spring-boot/components-starter/camel-ical-starter/src/main/java/org/apache/camel/component/ical/springboot/ICalDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-ical-starter/src/main/java/org/apache/camel/component/ical/springboot/ICalDataFormatAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-ical-starter/src/main/java/org/apache/camel/component/ical/springboot/ICalDataFormatAutoConfiguration.java index 3943c8f..b799b7d 100644 --- a/platforms/spring-boot/components-starter/camel-ical-starter/src/main/java/org/apache/camel/component/ical/springboot/ICalDataFormatAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-ical-starter/src/main/java/org/apache/camel/component/ical/springboot/ICalDataFormatAutoConfiguration.java @@ -20,7 +20,10 @@ import java.util.HashMap; import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; +import org.apache.camel.RuntimeCamelException; import org.apache.camel.component.ical.ICalDataFormat; +import org.apache.camel.spi.DataFormat; +import org.apache.camel.spi.DataFormatFactory; import org.apache.camel.util.IntrospectionSupport; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionMessage; @@ -35,7 +38,6 @@ 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; /** @@ -48,26 +50,36 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @EnableConfigurationProperties(ICalDataFormatConfiguration.class) public class ICalDataFormatAutoConfiguration { - @Bean(name = "ical-dataformat") - @Scope("prototype") + @Bean(name = "ical-dataformat-factory") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(ICalDataFormat.class) - public ICalDataFormat configureICalDataFormat(CamelContext camelContext, - ICalDataFormatConfiguration configuration) throws Exception { - ICalDataFormat dataformat = new ICalDataFormat(); - if (CamelContextAware.class.isAssignableFrom(ICalDataFormat.class)) { - CamelContextAware contextAware = CamelContextAware.class - .cast(dataformat); - if (contextAware != null) { - contextAware.setCamelContext(camelContext); + public DataFormatFactory configureICalDataFormatFactory( + final CamelContext camelContext, + final ICalDataFormatConfiguration configuration) { + return new DataFormatFactory() { + public DataFormat newInstance() { + ICalDataFormat dataformat = new ICalDataFormat(); + if (CamelContextAware.class + .isAssignableFrom(ICalDataFormat.class)) { + CamelContextAware contextAware = CamelContextAware.class + .cast(dataformat); + if (contextAware != null) { + contextAware.setCamelContext(camelContext); + } + } + try { + Map<String, Object> parameters = new HashMap<>(); + IntrospectionSupport.getProperties(configuration, + parameters, null, false); + IntrospectionSupport.setProperties(camelContext, + camelContext.getTypeConverter(), dataformat, + parameters); + } catch (Exception e) { + throw new RuntimeCamelException(e); + } + return dataformat; } - } - Map<String, Object> parameters = new HashMap<>(); - IntrospectionSupport.getProperties(configuration, parameters, null, - false); - IntrospectionSupport.setProperties(camelContext, - camelContext.getTypeConverter(), dataformat, parameters); - return dataformat; + }; } public static class Condition extends SpringBootCondition { http://git-wip-us.apache.org/repos/asf/camel/blob/c0a9f5cd/platforms/spring-boot/components-starter/camel-jackson-starter/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-jackson-starter/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-jackson-starter/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatAutoConfiguration.java index f75f042..406b5af 100644 --- a/platforms/spring-boot/components-starter/camel-jackson-starter/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-jackson-starter/src/main/java/org/apache/camel/component/jackson/springboot/JacksonDataFormatAutoConfiguration.java @@ -20,7 +20,10 @@ import java.util.HashMap; import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; +import org.apache.camel.RuntimeCamelException; import org.apache.camel.component.jackson.JacksonDataFormat; +import org.apache.camel.spi.DataFormat; +import org.apache.camel.spi.DataFormatFactory; import org.apache.camel.util.IntrospectionSupport; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionMessage; @@ -35,7 +38,6 @@ 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; /** @@ -48,27 +50,36 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @EnableConfigurationProperties(JacksonDataFormatConfiguration.class) public class JacksonDataFormatAutoConfiguration { - @Bean(name = "json-jackson-dataformat") - @Scope("prototype") + @Bean(name = "json-jackson-dataformat-factory") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(JacksonDataFormat.class) - public JacksonDataFormat configureJacksonDataFormat( - CamelContext camelContext, - JacksonDataFormatConfiguration configuration) throws Exception { - JacksonDataFormat dataformat = new JacksonDataFormat(); - if (CamelContextAware.class.isAssignableFrom(JacksonDataFormat.class)) { - CamelContextAware contextAware = CamelContextAware.class - .cast(dataformat); - if (contextAware != null) { - contextAware.setCamelContext(camelContext); + public DataFormatFactory configureJacksonDataFormatFactory( + final CamelContext camelContext, + final JacksonDataFormatConfiguration configuration) { + return new DataFormatFactory() { + public DataFormat newInstance() { + JacksonDataFormat dataformat = new JacksonDataFormat(); + if (CamelContextAware.class + .isAssignableFrom(JacksonDataFormat.class)) { + CamelContextAware contextAware = CamelContextAware.class + .cast(dataformat); + if (contextAware != null) { + contextAware.setCamelContext(camelContext); + } + } + try { + Map<String, Object> parameters = new HashMap<>(); + IntrospectionSupport.getProperties(configuration, + parameters, null, false); + IntrospectionSupport.setProperties(camelContext, + camelContext.getTypeConverter(), dataformat, + parameters); + } catch (Exception e) { + throw new RuntimeCamelException(e); + } + return dataformat; } - } - Map<String, Object> parameters = new HashMap<>(); - IntrospectionSupport.getProperties(configuration, parameters, null, - false); - IntrospectionSupport.setProperties(camelContext, - camelContext.getTypeConverter(), dataformat, parameters); - return dataformat; + }; } public static class Condition extends SpringBootCondition { http://git-wip-us.apache.org/repos/asf/camel/blob/c0a9f5cd/platforms/spring-boot/components-starter/camel-jacksonxml-starter/src/main/java/org/apache/camel/component/jacksonxml/springboot/JacksonXMLDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-jacksonxml-starter/src/main/java/org/apache/camel/component/jacksonxml/springboot/JacksonXMLDataFormatAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-jacksonxml-starter/src/main/java/org/apache/camel/component/jacksonxml/springboot/JacksonXMLDataFormatAutoConfiguration.java index 0061a0c..30c2f63 100644 --- a/platforms/spring-boot/components-starter/camel-jacksonxml-starter/src/main/java/org/apache/camel/component/jacksonxml/springboot/JacksonXMLDataFormatAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-jacksonxml-starter/src/main/java/org/apache/camel/component/jacksonxml/springboot/JacksonXMLDataFormatAutoConfiguration.java @@ -20,7 +20,10 @@ import java.util.HashMap; import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; +import org.apache.camel.RuntimeCamelException; import org.apache.camel.component.jacksonxml.JacksonXMLDataFormat; +import org.apache.camel.spi.DataFormat; +import org.apache.camel.spi.DataFormatFactory; import org.apache.camel.util.IntrospectionSupport; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionMessage; @@ -35,7 +38,6 @@ 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; /** @@ -48,28 +50,36 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @EnableConfigurationProperties(JacksonXMLDataFormatConfiguration.class) public class JacksonXMLDataFormatAutoConfiguration { - @Bean(name = "jacksonxml-dataformat") - @Scope("prototype") + @Bean(name = "jacksonxml-dataformat-factory") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(JacksonXMLDataFormat.class) - public JacksonXMLDataFormat configureJacksonXMLDataFormat( - CamelContext camelContext, - JacksonXMLDataFormatConfiguration configuration) throws Exception { - JacksonXMLDataFormat dataformat = new JacksonXMLDataFormat(); - if (CamelContextAware.class - .isAssignableFrom(JacksonXMLDataFormat.class)) { - CamelContextAware contextAware = CamelContextAware.class - .cast(dataformat); - if (contextAware != null) { - contextAware.setCamelContext(camelContext); + public DataFormatFactory configureJacksonXMLDataFormatFactory( + final CamelContext camelContext, + final JacksonXMLDataFormatConfiguration configuration) { + return new DataFormatFactory() { + public DataFormat newInstance() { + JacksonXMLDataFormat dataformat = new JacksonXMLDataFormat(); + if (CamelContextAware.class + .isAssignableFrom(JacksonXMLDataFormat.class)) { + CamelContextAware contextAware = CamelContextAware.class + .cast(dataformat); + if (contextAware != null) { + contextAware.setCamelContext(camelContext); + } + } + try { + Map<String, Object> parameters = new HashMap<>(); + IntrospectionSupport.getProperties(configuration, + parameters, null, false); + IntrospectionSupport.setProperties(camelContext, + camelContext.getTypeConverter(), dataformat, + parameters); + } catch (Exception e) { + throw new RuntimeCamelException(e); + } + return dataformat; } - } - Map<String, Object> parameters = new HashMap<>(); - IntrospectionSupport.getProperties(configuration, parameters, null, - false); - IntrospectionSupport.setProperties(camelContext, - camelContext.getTypeConverter(), dataformat, parameters); - return dataformat; + }; } public static class Condition extends SpringBootCondition { http://git-wip-us.apache.org/repos/asf/camel/blob/c0a9f5cd/platforms/spring-boot/components-starter/camel-jaxb-starter/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-jaxb-starter/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-jaxb-starter/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatAutoConfiguration.java index 23aa3c1..3562119 100644 --- a/platforms/spring-boot/components-starter/camel-jaxb-starter/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-jaxb-starter/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatAutoConfiguration.java @@ -20,7 +20,10 @@ import java.util.HashMap; import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; +import org.apache.camel.RuntimeCamelException; import org.apache.camel.converter.jaxb.JaxbDataFormat; +import org.apache.camel.spi.DataFormat; +import org.apache.camel.spi.DataFormatFactory; import org.apache.camel.util.IntrospectionSupport; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionMessage; @@ -35,7 +38,6 @@ 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; /** @@ -48,26 +50,36 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @EnableConfigurationProperties(JaxbDataFormatConfiguration.class) public class JaxbDataFormatAutoConfiguration { - @Bean(name = "jaxb-dataformat") - @Scope("prototype") + @Bean(name = "jaxb-dataformat-factory") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(JaxbDataFormat.class) - public JaxbDataFormat configureJaxbDataFormat(CamelContext camelContext, - JaxbDataFormatConfiguration configuration) throws Exception { - JaxbDataFormat dataformat = new JaxbDataFormat(); - if (CamelContextAware.class.isAssignableFrom(JaxbDataFormat.class)) { - CamelContextAware contextAware = CamelContextAware.class - .cast(dataformat); - if (contextAware != null) { - contextAware.setCamelContext(camelContext); + public DataFormatFactory configureJaxbDataFormatFactory( + final CamelContext camelContext, + final JaxbDataFormatConfiguration configuration) { + return new DataFormatFactory() { + public DataFormat newInstance() { + JaxbDataFormat dataformat = new JaxbDataFormat(); + if (CamelContextAware.class + .isAssignableFrom(JaxbDataFormat.class)) { + CamelContextAware contextAware = CamelContextAware.class + .cast(dataformat); + if (contextAware != null) { + contextAware.setCamelContext(camelContext); + } + } + try { + Map<String, Object> parameters = new HashMap<>(); + IntrospectionSupport.getProperties(configuration, + parameters, null, false); + IntrospectionSupport.setProperties(camelContext, + camelContext.getTypeConverter(), dataformat, + parameters); + } catch (Exception e) { + throw new RuntimeCamelException(e); + } + return dataformat; } - } - Map<String, Object> parameters = new HashMap<>(); - IntrospectionSupport.getProperties(configuration, parameters, null, - false); - IntrospectionSupport.setProperties(camelContext, - camelContext.getTypeConverter(), dataformat, parameters); - return dataformat; + }; } public static class Condition extends SpringBootCondition { http://git-wip-us.apache.org/repos/asf/camel/blob/c0a9f5cd/platforms/spring-boot/components-starter/camel-jibx-starter/src/main/java/org/apache/camel/dataformat/jibx/springboot/JibxDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-jibx-starter/src/main/java/org/apache/camel/dataformat/jibx/springboot/JibxDataFormatAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-jibx-starter/src/main/java/org/apache/camel/dataformat/jibx/springboot/JibxDataFormatAutoConfiguration.java index 7842ce0..179701a 100644 --- a/platforms/spring-boot/components-starter/camel-jibx-starter/src/main/java/org/apache/camel/dataformat/jibx/springboot/JibxDataFormatAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-jibx-starter/src/main/java/org/apache/camel/dataformat/jibx/springboot/JibxDataFormatAutoConfiguration.java @@ -20,7 +20,10 @@ import java.util.HashMap; import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; +import org.apache.camel.RuntimeCamelException; import org.apache.camel.dataformat.jibx.JibxDataFormat; +import org.apache.camel.spi.DataFormat; +import org.apache.camel.spi.DataFormatFactory; import org.apache.camel.util.IntrospectionSupport; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionMessage; @@ -35,7 +38,6 @@ 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; /** @@ -48,26 +50,36 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @EnableConfigurationProperties(JibxDataFormatConfiguration.class) public class JibxDataFormatAutoConfiguration { - @Bean(name = "jibx-dataformat") - @Scope("prototype") + @Bean(name = "jibx-dataformat-factory") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(JibxDataFormat.class) - public JibxDataFormat configureJibxDataFormat(CamelContext camelContext, - JibxDataFormatConfiguration configuration) throws Exception { - JibxDataFormat dataformat = new JibxDataFormat(); - if (CamelContextAware.class.isAssignableFrom(JibxDataFormat.class)) { - CamelContextAware contextAware = CamelContextAware.class - .cast(dataformat); - if (contextAware != null) { - contextAware.setCamelContext(camelContext); + public DataFormatFactory configureJibxDataFormatFactory( + final CamelContext camelContext, + final JibxDataFormatConfiguration configuration) { + return new DataFormatFactory() { + public DataFormat newInstance() { + JibxDataFormat dataformat = new JibxDataFormat(); + if (CamelContextAware.class + .isAssignableFrom(JibxDataFormat.class)) { + CamelContextAware contextAware = CamelContextAware.class + .cast(dataformat); + if (contextAware != null) { + contextAware.setCamelContext(camelContext); + } + } + try { + Map<String, Object> parameters = new HashMap<>(); + IntrospectionSupport.getProperties(configuration, + parameters, null, false); + IntrospectionSupport.setProperties(camelContext, + camelContext.getTypeConverter(), dataformat, + parameters); + } catch (Exception e) { + throw new RuntimeCamelException(e); + } + return dataformat; } - } - Map<String, Object> parameters = new HashMap<>(); - IntrospectionSupport.getProperties(configuration, parameters, null, - false); - IntrospectionSupport.setProperties(camelContext, - camelContext.getTypeConverter(), dataformat, parameters); - return dataformat; + }; } public static class Condition extends SpringBootCondition { http://git-wip-us.apache.org/repos/asf/camel/blob/c0a9f5cd/platforms/spring-boot/components-starter/camel-johnzon-starter/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-johnzon-starter/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-johnzon-starter/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatAutoConfiguration.java index 43e9e9a..0f5d2e0 100644 --- a/platforms/spring-boot/components-starter/camel-johnzon-starter/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-johnzon-starter/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatAutoConfiguration.java @@ -20,7 +20,10 @@ import java.util.HashMap; import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; +import org.apache.camel.RuntimeCamelException; import org.apache.camel.component.johnzon.JohnzonDataFormat; +import org.apache.camel.spi.DataFormat; +import org.apache.camel.spi.DataFormatFactory; import org.apache.camel.util.IntrospectionSupport; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionMessage; @@ -35,7 +38,6 @@ 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; /** @@ -48,27 +50,36 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @EnableConfigurationProperties(JohnzonDataFormatConfiguration.class) public class JohnzonDataFormatAutoConfiguration { - @Bean(name = "json-johnzon-dataformat") - @Scope("prototype") + @Bean(name = "json-johnzon-dataformat-factory") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(JohnzonDataFormat.class) - public JohnzonDataFormat configureJohnzonDataFormat( - CamelContext camelContext, - JohnzonDataFormatConfiguration configuration) throws Exception { - JohnzonDataFormat dataformat = new JohnzonDataFormat(); - if (CamelContextAware.class.isAssignableFrom(JohnzonDataFormat.class)) { - CamelContextAware contextAware = CamelContextAware.class - .cast(dataformat); - if (contextAware != null) { - contextAware.setCamelContext(camelContext); + public DataFormatFactory configureJohnzonDataFormatFactory( + final CamelContext camelContext, + final JohnzonDataFormatConfiguration configuration) { + return new DataFormatFactory() { + public DataFormat newInstance() { + JohnzonDataFormat dataformat = new JohnzonDataFormat(); + if (CamelContextAware.class + .isAssignableFrom(JohnzonDataFormat.class)) { + CamelContextAware contextAware = CamelContextAware.class + .cast(dataformat); + if (contextAware != null) { + contextAware.setCamelContext(camelContext); + } + } + try { + Map<String, Object> parameters = new HashMap<>(); + IntrospectionSupport.getProperties(configuration, + parameters, null, false); + IntrospectionSupport.setProperties(camelContext, + camelContext.getTypeConverter(), dataformat, + parameters); + } catch (Exception e) { + throw new RuntimeCamelException(e); + } + return dataformat; } - } - Map<String, Object> parameters = new HashMap<>(); - IntrospectionSupport.getProperties(configuration, parameters, null, - false); - IntrospectionSupport.setProperties(camelContext, - camelContext.getTypeConverter(), dataformat, parameters); - return dataformat; + }; } public static class Condition extends SpringBootCondition { http://git-wip-us.apache.org/repos/asf/camel/blob/c0a9f5cd/platforms/spring-boot/components-starter/camel-lzf-starter/src/main/java/org/apache/camel/dataformat/lzf/springboot/LZFDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-lzf-starter/src/main/java/org/apache/camel/dataformat/lzf/springboot/LZFDataFormatAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-lzf-starter/src/main/java/org/apache/camel/dataformat/lzf/springboot/LZFDataFormatAutoConfiguration.java index 213ebd1..fdffdef 100644 --- a/platforms/spring-boot/components-starter/camel-lzf-starter/src/main/java/org/apache/camel/dataformat/lzf/springboot/LZFDataFormatAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-lzf-starter/src/main/java/org/apache/camel/dataformat/lzf/springboot/LZFDataFormatAutoConfiguration.java @@ -20,7 +20,10 @@ import java.util.HashMap; import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; +import org.apache.camel.RuntimeCamelException; import org.apache.camel.dataformat.lzf.LZFDataFormat; +import org.apache.camel.spi.DataFormat; +import org.apache.camel.spi.DataFormatFactory; import org.apache.camel.util.IntrospectionSupport; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionMessage; @@ -35,7 +38,6 @@ 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; /** @@ -48,26 +50,36 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @EnableConfigurationProperties(LZFDataFormatConfiguration.class) public class LZFDataFormatAutoConfiguration { - @Bean(name = "lzf-dataformat") - @Scope("prototype") + @Bean(name = "lzf-dataformat-factory") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(LZFDataFormat.class) - public LZFDataFormat configureLZFDataFormat(CamelContext camelContext, - LZFDataFormatConfiguration configuration) throws Exception { - LZFDataFormat dataformat = new LZFDataFormat(); - if (CamelContextAware.class.isAssignableFrom(LZFDataFormat.class)) { - CamelContextAware contextAware = CamelContextAware.class - .cast(dataformat); - if (contextAware != null) { - contextAware.setCamelContext(camelContext); + public DataFormatFactory configureLZFDataFormatFactory( + final CamelContext camelContext, + final LZFDataFormatConfiguration configuration) { + return new DataFormatFactory() { + public DataFormat newInstance() { + LZFDataFormat dataformat = new LZFDataFormat(); + if (CamelContextAware.class + .isAssignableFrom(LZFDataFormat.class)) { + CamelContextAware contextAware = CamelContextAware.class + .cast(dataformat); + if (contextAware != null) { + contextAware.setCamelContext(camelContext); + } + } + try { + Map<String, Object> parameters = new HashMap<>(); + IntrospectionSupport.getProperties(configuration, + parameters, null, false); + IntrospectionSupport.setProperties(camelContext, + camelContext.getTypeConverter(), dataformat, + parameters); + } catch (Exception e) { + throw new RuntimeCamelException(e); + } + return dataformat; } - } - Map<String, Object> parameters = new HashMap<>(); - IntrospectionSupport.getProperties(configuration, parameters, null, - false); - IntrospectionSupport.setProperties(camelContext, - camelContext.getTypeConverter(), dataformat, parameters); - return dataformat; + }; } public static class Condition extends SpringBootCondition { http://git-wip-us.apache.org/repos/asf/camel/blob/c0a9f5cd/platforms/spring-boot/components-starter/camel-mail-starter/src/main/java/org/apache/camel/dataformat/mime/multipart/springboot/MimeMultipartDataFormatAutoConfiguration.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-mail-starter/src/main/java/org/apache/camel/dataformat/mime/multipart/springboot/MimeMultipartDataFormatAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-mail-starter/src/main/java/org/apache/camel/dataformat/mime/multipart/springboot/MimeMultipartDataFormatAutoConfiguration.java index a1e1197..3e97726 100644 --- a/platforms/spring-boot/components-starter/camel-mail-starter/src/main/java/org/apache/camel/dataformat/mime/multipart/springboot/MimeMultipartDataFormatAutoConfiguration.java +++ b/platforms/spring-boot/components-starter/camel-mail-starter/src/main/java/org/apache/camel/dataformat/mime/multipart/springboot/MimeMultipartDataFormatAutoConfiguration.java @@ -20,7 +20,10 @@ import java.util.HashMap; import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; +import org.apache.camel.RuntimeCamelException; import org.apache.camel.dataformat.mime.multipart.MimeMultipartDataFormat; +import org.apache.camel.spi.DataFormat; +import org.apache.camel.spi.DataFormatFactory; import org.apache.camel.util.IntrospectionSupport; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionMessage; @@ -35,7 +38,6 @@ 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; /** @@ -48,29 +50,36 @@ import org.springframework.core.type.AnnotatedTypeMetadata; @EnableConfigurationProperties(MimeMultipartDataFormatConfiguration.class) public class MimeMultipartDataFormatAutoConfiguration { - @Bean(name = "mime-multipart-dataformat") - @Scope("prototype") + @Bean(name = "mime-multipart-dataformat-factory") @ConditionalOnClass(CamelContext.class) @ConditionalOnMissingBean(MimeMultipartDataFormat.class) - public MimeMultipartDataFormat configureMimeMultipartDataFormat( - CamelContext camelContext, - MimeMultipartDataFormatConfiguration configuration) - throws Exception { - MimeMultipartDataFormat dataformat = new MimeMultipartDataFormat(); - if (CamelContextAware.class - .isAssignableFrom(MimeMultipartDataFormat.class)) { - CamelContextAware contextAware = CamelContextAware.class - .cast(dataformat); - if (contextAware != null) { - contextAware.setCamelContext(camelContext); + public DataFormatFactory configureMimeMultipartDataFormatFactory( + final CamelContext camelContext, + final MimeMultipartDataFormatConfiguration configuration) { + return new DataFormatFactory() { + public DataFormat newInstance() { + MimeMultipartDataFormat dataformat = new MimeMultipartDataFormat(); + if (CamelContextAware.class + .isAssignableFrom(MimeMultipartDataFormat.class)) { + CamelContextAware contextAware = CamelContextAware.class + .cast(dataformat); + if (contextAware != null) { + contextAware.setCamelContext(camelContext); + } + } + try { + Map<String, Object> parameters = new HashMap<>(); + IntrospectionSupport.getProperties(configuration, + parameters, null, false); + IntrospectionSupport.setProperties(camelContext, + camelContext.getTypeConverter(), dataformat, + parameters); + } catch (Exception e) { + throw new RuntimeCamelException(e); + } + return dataformat; } - } - Map<String, Object> parameters = new HashMap<>(); - IntrospectionSupport.getProperties(configuration, parameters, null, - false); - IntrospectionSupport.setProperties(camelContext, - camelContext.getTypeConverter(), dataformat, parameters); - return dataformat; + }; } public static class Condition extends SpringBootCondition {
