Skip to content

Commit 60caf1c

Browse files
committed
chore: regenerate auto-configuration classes with @autoConfiguration
Regenerated output from updated camel-spring-boot-generator-maven-plugin. All generated auto-configuration classes now use @autoConfiguration(after=...) instead of @configuration(proxyBeanMethods=false) + @AutoConfigureAfter, and constructor injection instead of @Autowired field injection.
1 parent 96185c1 commit 60caf1c

473 files changed

Lines changed: 4259 additions & 4729 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

components-starter/camel-activemq-starter/src/main/java/org/apache/camel/component/activemq/springboot/ActiveMQComponentAutoConfiguration.java

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,34 +26,33 @@
2626
import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
2727
import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
2828
import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
29-
import org.springframework.beans.factory.annotation.Autowired;
30-
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
29+
import org.springframework.boot.autoconfigure.AutoConfiguration;
3130
import org.springframework.boot.context.properties.EnableConfigurationProperties;
3231
import org.springframework.context.ApplicationContext;
3332
import org.springframework.context.annotation.Bean;
3433
import org.springframework.context.annotation.Conditional;
35-
import org.springframework.context.annotation.Configuration;
3634
import org.springframework.context.annotation.Lazy;
3735

3836
/**
3937
* Generated by camel-package-maven-plugin - do not edit this file!
4038
*/
41-
@Configuration(proxyBeanMethods = false)
39+
@AutoConfiguration(after = {CamelAutoConfiguration.class, ActiveMQComponentConverter.class})
4240
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
4341
@EnableConfigurationProperties({ComponentConfigurationProperties.class,ActiveMQComponentConfiguration.class})
4442
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.activemq"})
45-
@AutoConfigureAfter({CamelAutoConfiguration.class, ActiveMQComponentConverter.class})
4643
public class ActiveMQComponentAutoConfiguration {
4744

48-
@Autowired
49-
private ApplicationContext applicationContext;
45+
private final ApplicationContext applicationContext;
5046
private final CamelContext camelContext;
51-
@Autowired
52-
private ActiveMQComponentConfiguration configuration;
47+
private final ActiveMQComponentConfiguration configuration;
5348

5449
public ActiveMQComponentAutoConfiguration(
55-
org.apache.camel.CamelContext camelContext) {
50+
org.springframework.context.ApplicationContext applicationContext,
51+
org.apache.camel.CamelContext camelContext,
52+
org.apache.camel.component.activemq.springboot.ActiveMQComponentConfiguration configuration) {
53+
this.applicationContext = applicationContext;
5654
this.camelContext = camelContext;
55+
this.configuration = configuration;
5756
}
5857

5958
@Lazy

components-starter/camel-activemq6-starter/src/main/java/org/apache/camel/component/activemq6/springboot/ActiveMQComponentAutoConfiguration.java

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,34 +26,33 @@
2626
import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
2727
import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
2828
import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
29-
import org.springframework.beans.factory.annotation.Autowired;
30-
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
29+
import org.springframework.boot.autoconfigure.AutoConfiguration;
3130
import org.springframework.boot.context.properties.EnableConfigurationProperties;
3231
import org.springframework.context.ApplicationContext;
3332
import org.springframework.context.annotation.Bean;
3433
import org.springframework.context.annotation.Conditional;
35-
import org.springframework.context.annotation.Configuration;
3634
import org.springframework.context.annotation.Lazy;
3735

3836
/**
3937
* Generated by camel-package-maven-plugin - do not edit this file!
4038
*/
41-
@Configuration(proxyBeanMethods = false)
39+
@AutoConfiguration(after = {CamelAutoConfiguration.class, ActiveMQComponentConverter.class})
4240
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
4341
@EnableConfigurationProperties({ComponentConfigurationProperties.class,ActiveMQComponentConfiguration.class})
4442
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.activemq6"})
45-
@AutoConfigureAfter({CamelAutoConfiguration.class, ActiveMQComponentConverter.class})
4643
public class ActiveMQComponentAutoConfiguration {
4744

48-
@Autowired
49-
private ApplicationContext applicationContext;
45+
private final ApplicationContext applicationContext;
5046
private final CamelContext camelContext;
51-
@Autowired
52-
private ActiveMQComponentConfiguration configuration;
47+
private final ActiveMQComponentConfiguration configuration;
5348

5449
public ActiveMQComponentAutoConfiguration(
55-
org.apache.camel.CamelContext camelContext) {
50+
org.springframework.context.ApplicationContext applicationContext,
51+
org.apache.camel.CamelContext camelContext,
52+
org.apache.camel.component.activemq6.springboot.ActiveMQComponentConfiguration configuration) {
53+
this.applicationContext = applicationContext;
5654
this.camelContext = camelContext;
55+
this.configuration = configuration;
5756
}
5857

5958
@Lazy

components-starter/camel-amqp-starter/src/main/java/org/apache/camel/component/amqp/springboot/AMQPComponentAutoConfiguration.java

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,34 +26,33 @@
2626
import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
2727
import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
2828
import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
29-
import org.springframework.beans.factory.annotation.Autowired;
30-
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
29+
import org.springframework.boot.autoconfigure.AutoConfiguration;
3130
import org.springframework.boot.context.properties.EnableConfigurationProperties;
3231
import org.springframework.context.ApplicationContext;
3332
import org.springframework.context.annotation.Bean;
3433
import org.springframework.context.annotation.Conditional;
35-
import org.springframework.context.annotation.Configuration;
3634
import org.springframework.context.annotation.Lazy;
3735

3836
/**
3937
* Generated by camel-package-maven-plugin - do not edit this file!
4038
*/
41-
@Configuration(proxyBeanMethods = false)
39+
@AutoConfiguration(after = {CamelAutoConfiguration.class, AMQPComponentConverter.class})
4240
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
4341
@EnableConfigurationProperties({ComponentConfigurationProperties.class,AMQPComponentConfiguration.class})
4442
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.amqp"})
45-
@AutoConfigureAfter({CamelAutoConfiguration.class, AMQPComponentConverter.class})
4643
public class AMQPComponentAutoConfiguration {
4744

48-
@Autowired
49-
private ApplicationContext applicationContext;
45+
private final ApplicationContext applicationContext;
5046
private final CamelContext camelContext;
51-
@Autowired
52-
private AMQPComponentConfiguration configuration;
47+
private final AMQPComponentConfiguration configuration;
5348

5449
public AMQPComponentAutoConfiguration(
55-
org.apache.camel.CamelContext camelContext) {
50+
org.springframework.context.ApplicationContext applicationContext,
51+
org.apache.camel.CamelContext camelContext,
52+
org.apache.camel.component.amqp.springboot.AMQPComponentConfiguration configuration) {
53+
this.applicationContext = applicationContext;
5654
this.camelContext = camelContext;
55+
this.configuration = configuration;
5756
}
5857

5958
@Lazy

components-starter/camel-arangodb-starter/src/main/java/org/apache/camel/component/arangodb/springboot/ArangoDbComponentAutoConfiguration.java

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,34 +26,33 @@
2626
import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
2727
import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
2828
import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
29-
import org.springframework.beans.factory.annotation.Autowired;
30-
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
29+
import org.springframework.boot.autoconfigure.AutoConfiguration;
3130
import org.springframework.boot.context.properties.EnableConfigurationProperties;
3231
import org.springframework.context.ApplicationContext;
3332
import org.springframework.context.annotation.Bean;
3433
import org.springframework.context.annotation.Conditional;
35-
import org.springframework.context.annotation.Configuration;
3634
import org.springframework.context.annotation.Lazy;
3735

3836
/**
3937
* Generated by camel-package-maven-plugin - do not edit this file!
4038
*/
41-
@Configuration(proxyBeanMethods = false)
39+
@AutoConfiguration(after = {CamelAutoConfiguration.class, ArangoDbComponentConverter.class})
4240
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
4341
@EnableConfigurationProperties({ComponentConfigurationProperties.class,ArangoDbComponentConfiguration.class})
4442
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.arangodb"})
45-
@AutoConfigureAfter({CamelAutoConfiguration.class, ArangoDbComponentConverter.class})
4643
public class ArangoDbComponentAutoConfiguration {
4744

48-
@Autowired
49-
private ApplicationContext applicationContext;
45+
private final ApplicationContext applicationContext;
5046
private final CamelContext camelContext;
51-
@Autowired
52-
private ArangoDbComponentConfiguration configuration;
47+
private final ArangoDbComponentConfiguration configuration;
5348

5449
public ArangoDbComponentAutoConfiguration(
55-
org.apache.camel.CamelContext camelContext) {
50+
org.springframework.context.ApplicationContext applicationContext,
51+
org.apache.camel.CamelContext camelContext,
52+
org.apache.camel.component.arangodb.springboot.ArangoDbComponentConfiguration configuration) {
53+
this.applicationContext = applicationContext;
5654
this.camelContext = camelContext;
55+
this.configuration = configuration;
5756
}
5857

5958
@Lazy

components-starter/camel-as2-starter/src/main/java/org/apache/camel/component/as2/springboot/AS2ComponentAutoConfiguration.java

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,34 +26,33 @@
2626
import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
2727
import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
2828
import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
29-
import org.springframework.beans.factory.annotation.Autowired;
30-
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
29+
import org.springframework.boot.autoconfigure.AutoConfiguration;
3130
import org.springframework.boot.context.properties.EnableConfigurationProperties;
3231
import org.springframework.context.ApplicationContext;
3332
import org.springframework.context.annotation.Bean;
3433
import org.springframework.context.annotation.Conditional;
35-
import org.springframework.context.annotation.Configuration;
3634
import org.springframework.context.annotation.Lazy;
3735

3836
/**
3937
* Generated by camel-package-maven-plugin - do not edit this file!
4038
*/
41-
@Configuration(proxyBeanMethods = false)
39+
@AutoConfiguration(after = {CamelAutoConfiguration.class, AS2ComponentConverter.class})
4240
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
4341
@EnableConfigurationProperties({ComponentConfigurationProperties.class,AS2ComponentConfiguration.class})
4442
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.as2"})
45-
@AutoConfigureAfter({CamelAutoConfiguration.class, AS2ComponentConverter.class})
4643
public class AS2ComponentAutoConfiguration {
4744

48-
@Autowired
49-
private ApplicationContext applicationContext;
45+
private final ApplicationContext applicationContext;
5046
private final CamelContext camelContext;
51-
@Autowired
52-
private AS2ComponentConfiguration configuration;
47+
private final AS2ComponentConfiguration configuration;
5348

5449
public AS2ComponentAutoConfiguration(
55-
org.apache.camel.CamelContext camelContext) {
50+
org.springframework.context.ApplicationContext applicationContext,
51+
org.apache.camel.CamelContext camelContext,
52+
org.apache.camel.component.as2.springboot.AS2ComponentConfiguration configuration) {
53+
this.applicationContext = applicationContext;
5654
this.camelContext = camelContext;
55+
this.configuration = configuration;
5756
}
5857

5958
@Lazy

components-starter/camel-asn1-starter/src/main/java/org/apache/camel/dataformat/asn1/springboot/ASN1DataFormatAutoConfiguration.java

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,35 +26,34 @@
2626
import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
2727
import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
2828
import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
29-
import org.springframework.beans.factory.annotation.Autowired;
30-
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
29+
import org.springframework.boot.autoconfigure.AutoConfiguration;
3130
import org.springframework.boot.context.properties.EnableConfigurationProperties;
3231
import org.springframework.boot.convert.ApplicationConversionService;
3332
import org.springframework.context.ApplicationContext;
3433
import org.springframework.context.annotation.Bean;
3534
import org.springframework.context.annotation.Conditional;
36-
import org.springframework.context.annotation.Configuration;
3735
import org.springframework.context.annotation.Lazy;
3836

3937
/**
4038
* Generated by camel-package-maven-plugin - do not edit this file!
4139
*/
42-
@Configuration(proxyBeanMethods = false)
43-
@AutoConfigureAfter(CamelAutoConfiguration.class)
40+
@AutoConfiguration(after = CamelAutoConfiguration.class)
4441
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
4542
@EnableConfigurationProperties({DataFormatConfigurationProperties.class,ASN1DataFormatConfiguration.class})
4643
@ConditionalOnHierarchicalProperties({"camel.dataformat", "camel.dataformat.asn1"})
4744
public class ASN1DataFormatAutoConfiguration {
4845

49-
@Autowired
50-
private ApplicationContext applicationContext;
46+
private final ApplicationContext applicationContext;
5147
private final CamelContext camelContext;
52-
@Autowired
53-
private ASN1DataFormatConfiguration configuration;
48+
private final ASN1DataFormatConfiguration configuration;
5449

5550
public ASN1DataFormatAutoConfiguration(
56-
org.apache.camel.CamelContext camelContext) {
51+
org.springframework.context.ApplicationContext applicationContext,
52+
org.apache.camel.CamelContext camelContext,
53+
org.apache.camel.dataformat.asn1.springboot.ASN1DataFormatConfiguration configuration) {
54+
this.applicationContext = applicationContext;
5755
this.camelContext = camelContext;
56+
this.configuration = configuration;
5857
}
5958

6059
@Lazy

components-starter/camel-asterisk-starter/src/main/java/org/apache/camel/component/asterisk/springboot/AsteriskComponentAutoConfiguration.java

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,34 +26,33 @@
2626
import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
2727
import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
2828
import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
29-
import org.springframework.beans.factory.annotation.Autowired;
30-
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
29+
import org.springframework.boot.autoconfigure.AutoConfiguration;
3130
import org.springframework.boot.context.properties.EnableConfigurationProperties;
3231
import org.springframework.context.ApplicationContext;
3332
import org.springframework.context.annotation.Bean;
3433
import org.springframework.context.annotation.Conditional;
35-
import org.springframework.context.annotation.Configuration;
3634
import org.springframework.context.annotation.Lazy;
3735

3836
/**
3937
* Generated by camel-package-maven-plugin - do not edit this file!
4038
*/
41-
@Configuration(proxyBeanMethods = false)
39+
@AutoConfiguration(after = CamelAutoConfiguration.class)
4240
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
4341
@EnableConfigurationProperties({ComponentConfigurationProperties.class,AsteriskComponentConfiguration.class})
4442
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.asterisk"})
45-
@AutoConfigureAfter(CamelAutoConfiguration.class)
4643
public class AsteriskComponentAutoConfiguration {
4744

48-
@Autowired
49-
private ApplicationContext applicationContext;
45+
private final ApplicationContext applicationContext;
5046
private final CamelContext camelContext;
51-
@Autowired
52-
private AsteriskComponentConfiguration configuration;
47+
private final AsteriskComponentConfiguration configuration;
5348

5449
public AsteriskComponentAutoConfiguration(
55-
org.apache.camel.CamelContext camelContext) {
50+
org.springframework.context.ApplicationContext applicationContext,
51+
org.apache.camel.CamelContext camelContext,
52+
org.apache.camel.component.asterisk.springboot.AsteriskComponentConfiguration configuration) {
53+
this.applicationContext = applicationContext;
5654
this.camelContext = camelContext;
55+
this.configuration = configuration;
5756
}
5857

5958
@Lazy

components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentAutoConfiguration.java

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,34 +26,33 @@
2626
import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
2727
import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
2828
import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
29-
import org.springframework.beans.factory.annotation.Autowired;
30-
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
29+
import org.springframework.boot.autoconfigure.AutoConfiguration;
3130
import org.springframework.boot.context.properties.EnableConfigurationProperties;
3231
import org.springframework.context.ApplicationContext;
3332
import org.springframework.context.annotation.Bean;
3433
import org.springframework.context.annotation.Conditional;
35-
import org.springframework.context.annotation.Configuration;
3634
import org.springframework.context.annotation.Lazy;
3735

3836
/**
3937
* Generated by camel-package-maven-plugin - do not edit this file!
4038
*/
41-
@Configuration(proxyBeanMethods = false)
39+
@AutoConfiguration(after = {CamelAutoConfiguration.class, WebsocketComponentConverter.class})
4240
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
4341
@EnableConfigurationProperties({ComponentConfigurationProperties.class,WebsocketComponentConfiguration.class})
4442
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.atmosphere-websocket"})
45-
@AutoConfigureAfter({CamelAutoConfiguration.class, WebsocketComponentConverter.class})
4643
public class WebsocketComponentAutoConfiguration {
4744

48-
@Autowired
49-
private ApplicationContext applicationContext;
45+
private final ApplicationContext applicationContext;
5046
private final CamelContext camelContext;
51-
@Autowired
52-
private WebsocketComponentConfiguration configuration;
47+
private final WebsocketComponentConfiguration configuration;
5348

5449
public WebsocketComponentAutoConfiguration(
55-
org.apache.camel.CamelContext camelContext) {
50+
org.springframework.context.ApplicationContext applicationContext,
51+
org.apache.camel.CamelContext camelContext,
52+
org.apache.camel.component.atmosphere.websocket.springboot.WebsocketComponentConfiguration configuration) {
53+
this.applicationContext = applicationContext;
5654
this.camelContext = camelContext;
55+
this.configuration = configuration;
5756
}
5857

5958
@Lazy

components-starter/camel-atom-starter/src/main/java/org/apache/camel/component/atom/springboot/AtomComponentAutoConfiguration.java

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,34 +26,33 @@
2626
import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
2727
import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties;
2828
import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
29-
import org.springframework.beans.factory.annotation.Autowired;
30-
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
29+
import org.springframework.boot.autoconfigure.AutoConfiguration;
3130
import org.springframework.boot.context.properties.EnableConfigurationProperties;
3231
import org.springframework.context.ApplicationContext;
3332
import org.springframework.context.annotation.Bean;
3433
import org.springframework.context.annotation.Conditional;
35-
import org.springframework.context.annotation.Configuration;
3634
import org.springframework.context.annotation.Lazy;
3735

3836
/**
3937
* Generated by camel-package-maven-plugin - do not edit this file!
4038
*/
41-
@Configuration(proxyBeanMethods = false)
39+
@AutoConfiguration(after = CamelAutoConfiguration.class)
4240
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
4341
@EnableConfigurationProperties({ComponentConfigurationProperties.class,AtomComponentConfiguration.class})
4442
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.atom"})
45-
@AutoConfigureAfter(CamelAutoConfiguration.class)
4643
public class AtomComponentAutoConfiguration {
4744

48-
@Autowired
49-
private ApplicationContext applicationContext;
45+
private final ApplicationContext applicationContext;
5046
private final CamelContext camelContext;
51-
@Autowired
52-
private AtomComponentConfiguration configuration;
47+
private final AtomComponentConfiguration configuration;
5348

5449
public AtomComponentAutoConfiguration(
55-
org.apache.camel.CamelContext camelContext) {
50+
org.springframework.context.ApplicationContext applicationContext,
51+
org.apache.camel.CamelContext camelContext,
52+
org.apache.camel.component.atom.springboot.AtomComponentConfiguration configuration) {
53+
this.applicationContext = applicationContext;
5654
this.camelContext = camelContext;
55+
this.configuration = configuration;
5756
}
5857

5958
@Lazy

0 commit comments

Comments
 (0)